On 29 October 2015 at 09:39, Michael S. Tsirkin <m...@redhat.com> wrote: > 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
Applied, thanks. -- PMM
