Message ID | 20200918150506.286890-1-mst@redhat.com |
---|---|
State | New |
Headers | show |
On Fri, 18 Sep 2020 at 16:05, Michael S. Tsirkin <mst@redhat.com> wrote: > > The following changes since commit 8ee612722dc08830761516e761dde934c3753a14: > > Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20200915' into staging (2020-09-16 14:47:50 +0100) > > 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 4c67a4c6b399c8fadacb0a0b542d6372fd4092f5: > > virtio-iommu-pci: force virtio version 1 (2020-09-18 10:58:09 -0400) > > ---------------------------------------------------------------- > virtio,pc,acpi: fixes, tests > > Fixes and tests all over the place. > Batch iommu updates for vdpa. > Removal of deprecated cpu hotplug commands. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > ---------------------------------------------------------------- Conflict in hw/i386/pc.c -- can you fix up and resend, please? thanks -- PMM
The following changes since commit 8ee612722dc08830761516e761dde934c3753a14: Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20200915' into staging (2020-09-16 14:47:50 +0100) 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 4c67a4c6b399c8fadacb0a0b542d6372fd4092f5: virtio-iommu-pci: force virtio version 1 (2020-09-18 10:58:09 -0400) ---------------------------------------------------------------- virtio,pc,acpi: fixes, tests Fixes and tests all over the place. Batch iommu updates for vdpa. Removal of deprecated cpu hotplug commands. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- David Hildenbrand (1): pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine Dima Stepanov (7): vhost: recheck dev state in the vhost_migration_log routine vhost: check queue state in the vhost_dev_set_log routine tests/qtest/vhost-user-test: prepare the tests for adding new dev class tests/qtest/libqos/virtio-blk: add support for vhost-user-blk tests/qtest/vhost-user-test: add support for the vhost-user-blk device tests/qtest/vhost-user-test: add migrate_reconnect test tests/qtest/vhost-user-test: enable the reconnect tests Eric Auger (2): virtio-iommu: Check gtrees are non null before destroying them virtio-iommu-pci: force virtio version 1 Igor Mammedov (1): cphp: remove deprecated cpu-add command(s) Jason Wang (3): linux headers: sync to 5.9-rc4 vhost: switch to use IOTLB v2 format vhost-vdpa: batch updating IOTLB mappings Li Qiang (1): virtio-mem: detach the element from the virtqueue when error occurs qapi/machine.json | 24 -- include/hw/boards.h | 1 - include/hw/i386/pc.h | 1 - include/hw/virtio/vhost-backend.h | 2 + include/hw/virtio/vhost-user-blk.h | 10 + include/hw/virtio/vhost-vdpa.h | 1 + include/hw/virtio/vhost.h | 1 + include/monitor/hmp.h | 1 - include/standard-headers/drm/drm_fourcc.h | 140 ++++++++++ include/standard-headers/linux/ethtool.h | 87 +++++++ include/standard-headers/linux/input-event-codes.h | 3 +- include/standard-headers/linux/vhost_types.h | 11 + include/standard-headers/linux/virtio_9p.h | 4 +- include/standard-headers/linux/virtio_blk.h | 26 +- include/standard-headers/linux/virtio_config.h | 8 +- include/standard-headers/linux/virtio_console.h | 8 +- include/standard-headers/linux/virtio_net.h | 6 +- include/standard-headers/linux/virtio_scsi.h | 20 +- linux-headers/asm-generic/unistd.h | 6 +- linux-headers/asm-mips/unistd_n32.h | 1 + linux-headers/asm-mips/unistd_n64.h | 1 + linux-headers/asm-mips/unistd_o32.h | 1 + linux-headers/asm-powerpc/kvm.h | 5 + linux-headers/asm-powerpc/unistd_32.h | 1 + linux-headers/asm-powerpc/unistd_64.h | 1 + linux-headers/asm-s390/kvm.h | 7 +- linux-headers/asm-s390/unistd_32.h | 1 + linux-headers/asm-s390/unistd_64.h | 1 + linux-headers/asm-x86/unistd_32.h | 1 + linux-headers/asm-x86/unistd_64.h | 1 + linux-headers/asm-x86/unistd_x32.h | 1 + linux-headers/linux/kvm.h | 4 + linux-headers/linux/vfio.h | 2 +- linux-headers/linux/vhost.h | 2 + hw/block/vhost-user-blk.c | 19 +- hw/core/machine-hmp-cmds.c | 12 - hw/core/machine-qmp-cmds.c | 12 - hw/i386/pc.c | 27 -- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 2 +- hw/s390x/s390-virtio-ccw.c | 12 - hw/virtio/vhost-backend.c | 88 +++++-- hw/virtio/vhost-vdpa.c | 66 +++++ hw/virtio/vhost.c | 49 +++- hw/virtio/virtio-iommu-pci.c | 2 +- hw/virtio/virtio-iommu.c | 8 +- hw/virtio/virtio-mem.c | 3 + tests/qtest/cpu-plug-test.c | 100 +------ tests/qtest/libqos/virtio-blk.c | 14 + tests/qtest/test-hmp.c | 1 - tests/qtest/vhost-user-test.c | 289 ++++++++++++++++++--- docs/system/deprecated.rst | 25 +- hmp-commands.hx | 15 -- 53 files changed, 813 insertions(+), 322 deletions(-)