qemu-e2k/hw/virtio
Anthony Liguori b5d54bd421 Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5
* qemu-kvm/uq/master:
  kvm-stub: fix compilation
  kvm: shorten the parameter list for get_real_device()
  kvm: i386: fix LAPIC TSC deadline timer save/restore
  kvm-all.c: max_cpus should not exceed KVM vcpu limit
  kvm: Simplify kvm_handle_io
  kvm: x86: fix setting IA32_FEATURE_CONTROL with nested VMX disabled
  kvm: add KVM_IRQFD_FLAG_RESAMPLE support
  kvm: migrate vPMU state
  target-i386: remove tabs from target-i386/cpu.h
  Initialize IA32_FEATURE_CONTROL MSR in reset and migration

Conflicts:
	target-i386/cpu.h
	target-i386/kvm.c

aliguori: fixup trivial conflicts due to whitespace and added cpu
          argument

Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
2013-08-29 17:21:51 -05:00
..
dataplane virtio: clear signalled_used_valid when switching from dataplane 2013-08-12 12:19:04 +03:00
Makefile.objs
vhost.c vhost: clear signalled_used_valid on vhost stop 2013-08-12 12:25:17 +03:00
virtio-balloon.c aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
virtio-bus.c
virtio-mmio.c hw/virtio/virtio-mmio: Make QueueNumMax read 0 for unavailable queues 2013-08-12 11:57:56 +01:00
virtio-pci.c Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 2013-08-29 17:21:51 -05:00
virtio-pci.h
virtio-rng.c aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
virtio.c virtio: virtqueue_get_avail_bytes: fix desc_pa when loop over the indirect descriptor table 2013-08-25 12:52:33 +03:00