Merge commit 'd2f2b8a740c82319f9eea51ebed50815fbc3da3e' into upstream-merge
commit966eb0dfc6c080e9b870615baa27925414ec7a51
authorMarcelo Tosatti <mtosatti@redhat.com>
Fri, 21 Jan 2011 19:41:31 +0000 (21 17:41 -0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Fri, 21 Jan 2011 19:41:31 +0000 (21 17:41 -0200)
tree4fdd558c16794b6b216ac9eafcf61998a88d8803
parent777c5d1864bb3e218338c8328d7cce269fa51c5c
parentd2f2b8a740c82319f9eea51ebed50815fbc3da3e
Merge commit 'd2f2b8a740c82319f9eea51ebed50815fbc3da3e' into upstream-merge

* commit 'd2f2b8a740c82319f9eea51ebed50815fbc3da3e':
  kvm: test for ioeventfd support on old kernels
  virtio: move vmstate change tracking to core
  virtio-pci: Rename bugs field to flags
  qxl: tag as not hotpluggable
  vga: tag as not hotplugable.
  piix: tag as not hotpluggable.
  pci: allow devices being tagged as not hotpluggable.
  rtl8139: Use subsection to restrict migration after hotplug
  qdev: Track runtime machine modifications

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
12 files changed:
hw/acpi_piix4.c
hw/cirrus_vga.c
hw/pci.c
hw/pci.h
hw/piix_pci.c
hw/vga-pci.c
hw/virtio-pci.c
kvm-all.c
kvm-stub.c
kvm.h
qemu-kvm.c
qemu-kvm.h