The following changes since commit 496fedddce9a575111df4f912fb9e361037531ed:
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2015-10-28 15:08:36 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream for you to fetch changes up to 3f1e1478db2d67098d98f2c3acf5a4946b7fb643: enable multi-function hot-add (2015-10-29 11:17:53 +0200) ---------------------------------------------------------------- virtio, pc, memory: fixes+features for 2.5 New features: This enables hotplug for multifunction devices. Patches are very small, so I think it's OK to merge at this stage. There's also some new infrastructure for vhost-user testing not enabled yet so it's harmless to merge. I've reverted the "gap between DIMMs" workaround, as it seems too risky, and applied my own patch in virtio, but not in dataplane code. This means that dataplane is broken for some complex DIMM configurations for now. Waiting for Stefan to review the dataplane fix. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> ---------------------------------------------------------------- Cao jin (2): remove function during multi-function hot-add enable multi-function hot-add Igor Mammedov (1): pc: memhp: do not emit inserting event for coldplugged DIMMs Michael S. Tsirkin (12): vhost-user: cleanup struct size math vhost-user: cleanup msg size math vhost-user-test: fix up rhel6 build mmap-alloc: fix error handling virtio: introduce virtio_map virtio: switch to virtio_map virtio-blk: convert to virtqueue_map virtio-serial: convert to virtio_map virtio-scsi: convert to virtqueue_map virtio: drop virtqueue_map_sg Revert "pc: memhp: force gaps between DIMM's GPA" Revert "memhp: extend address auto assignment to support gaps" Victor Kaplansky (1): tests/vhost-user-bridge: add vhost-user bridge application include/hw/i386/pc.h | 1 - include/hw/mem/pc-dimm.h | 7 +- include/hw/pci/pci.h | 1 + include/hw/virtio/virtio.h | 3 +- hw/acpi/memory_hotplug.c | 8 +- hw/block/virtio-blk.c | 5 +- hw/char/virtio-serial-bus.c | 5 +- hw/i386/pc.c | 5 +- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - hw/mem/pc-dimm.c | 15 +- hw/pci/pci.c | 40 +- hw/pci/pci_host.c | 15 + hw/pci/pcie.c | 39 +- hw/ppc/spapr.c | 2 +- hw/scsi/virtio-scsi.c | 16 +- hw/virtio/vhost-user.c | 22 +- hw/virtio/virtio.c | 52 +- tests/vhost-user-bridge.c | 1110 +++++++++++++++++++++++++++++++++++++++++++ tests/vhost-user-test.c | 18 +- util/mmap-alloc.c | 4 +- tests/Makefile | 1 + 22 files changed, 1276 insertions(+), 95 deletions(-) create mode 100644 tests/vhost-user-bridge.c