| Message ID | 20200921112913.555392-1-mst@redhat.com |
|---|---|
| Headers | show |
| Series | virtio,pc,acpi: fixes, tests | expand |
Michael S. Tsirkin <mst@redhat.com> 于2020年9月21日周一 下午7:30写道： > > The following changes since commit 053a4177817db307ec854356e95b5b350800a216: > > Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200918' into staging (2020-09-18 16:34:26 +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 acbdbd5db6dab68534702987a487360fd8ae02b7: > > virtio-iommu-pci: force virtio version 1 (2020-09-21 06:14:46 -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 Hello Michael, It seems you lost the virtio-pmem patch. https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg02639.html Anyway, it can be queued in the next pr. Thanks, Li Qiang > > 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, 812 insertions(+), 323 deletions(-) > >
On Mon, Sep 21, 2020 at 07:44:42PM +0800, Li Qiang wrote: > Michael S. Tsirkin <mst@redhat.com> 于2020年9月21日周一 下午7:30写道： > > > > The following changes since commit 053a4177817db307ec854356e95b5b350800a216: > > > > Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200918' into staging (2020-09-18 16:34:26 +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 acbdbd5db6dab68534702987a487360fd8ae02b7: > > > > virtio-iommu-pci: force virtio version 1 (2020-09-21 06:14:46 -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 > > Hello Michael, > It seems you lost the virtio-pmem patch. > > https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg02639.html That's because I was never copied. Can you repost with all tags and Cc me? Subject can be PATCH repost. > Anyway, it can be queued in the next pr. > > Thanks, > Li Qiang
Patchew URL: https://patchew.org/QEMU/20200921112913.555392-1-mst@redhat.com/ Hi, This series seems to have some coding style problems. See output below for more information: Type: series Message-id: 20200921112913.555392-1-mst@redhat.com Subject: [PULL v3 00/15] virtio,pc,acpi: fixes, tests === TEST SCRIPT BEGIN === #!/bin/bash git rev-parse base > /dev/null || exit 0 git config --local diff.renamelimit 0 git config --local diff.renames True git config --local diff.algorithm histogram ./scripts/checkpatch.pl --mailback base.. === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test' 5ef45e3 virtio-iommu-pci: force virtio version 1 ee9176b virtio-iommu: Check gtrees are non null before destroying them 70803757 cphp: remove deprecated cpu-add command(s) 747e251 tests/qtest/vhost-user-test: enable the reconnect tests a283884 tests/qtest/vhost-user-test: add migrate_reconnect test 21199da tests/qtest/vhost-user-test: add support for the vhost-user-blk device d07a0dd tests/qtest/libqos/virtio-blk: add support for vhost-user-blk 270b93f tests/qtest/vhost-user-test: prepare the tests for adding new dev class 5c2d89c vhost: check queue state in the vhost_dev_set_log routine 929fa1b vhost: recheck dev state in the vhost_migration_log routine 426794b pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine c06b877 virtio-mem: detach the element from the virtqueue when error occurs 38dfe22 vhost-vdpa: batch updating IOTLB mappings aa21167 vhost: switch to use IOTLB v2 format 745e38b linux headers: sync to 5.9-rc4 === OUTPUT BEGIN === 1/15 Checking commit 745e38b52a25 (linux headers: sync to 5.9-rc4) 2/15 Checking commit aa2116789222 (vhost: switch to use IOTLB v2 format) 3/15 Checking commit 38dfe229f3e0 (vhost-vdpa: batch updating IOTLB mappings) 4/15 Checking commit c06b8779ce68 (virtio-mem: detach the element from the virtqueue when error occurs) 5/15 Checking commit 426794b44fc9 (pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine) 6/15 Checking commit 929fa1bfff8e (vhost: recheck dev state in the vhost_migration_log routine) 7/15 Checking commit 5c2d89cfca7e (vhost: check queue state in the vhost_dev_set_log routine) 8/15 Checking commit 270b93f4e8d9 (tests/qtest/vhost-user-test: prepare the tests for adding new dev class) 9/15 Checking commit d07a0ddb618a (tests/qtest/libqos/virtio-blk: add support for vhost-user-blk) 10/15 Checking commit 21199da52737 (tests/qtest/vhost-user-test: add support for the vhost-user-blk device) ERROR: code indent should never use tabs #252: FILE: tests/qtest/vhost-user-test.c:1070: +^I sizeof(msg->payload.config.region) + msg->payload.config.size;$ total: 1 errors, 0 warnings, 256 lines checked Patch 10/15 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. 11/15 Checking commit a2838844dadc (tests/qtest/vhost-user-test: add migrate_reconnect test) 12/15 Checking commit 747e2515ffaa (tests/qtest/vhost-user-test: enable the reconnect tests) 13/15 Checking commit 70803757e6f4 (cphp: remove deprecated cpu-add command(s)) 14/15 Checking commit ee9176bebd38 (virtio-iommu: Check gtrees are non null before destroying them) 15/15 Checking commit 5ef45e322a30 (virtio-iommu-pci: force virtio version 1) === OUTPUT END === Test command exited with code: 1 The full log is available at http://patchew.org/logs/20200921112913.555392-1-mst@redhat.com/testing.checkpatch/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
Michael S. Tsirkin <mst@redhat.com> 于2020年9月21日周一 下午8:31写道： > > On Mon, Sep 21, 2020 at 07:44:42PM +0800, Li Qiang wrote: > > Michael S. Tsirkin <mst@redhat.com> 于2020年9月21日周一 下午7:30写道： > > > > > > The following changes since commit 053a4177817db307ec854356e95b5b350800a216: > > > > > > Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200918' into staging (2020-09-18 16:34:26 +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 acbdbd5db6dab68534702987a487360fd8ae02b7: > > > > > > virtio-iommu-pci: force virtio version 1 (2020-09-21 06:14:46 -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 > > > > Hello Michael, > > It seems you lost the virtio-pmem patch. > > > > https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg02639.html > > That's because I was never copied. Can you repost with all tags and Cc > me? > Subject can be PATCH repost. I have resent it with subject: [PATCH REPOST] hw: virtio-pmem: detach the element fromt the virtqueue when error occurs Thanks, Li Qiang > > > Anyway, it can be queued in the next pr. > > > > Thanks, > > Li Qiang >
Peter, you said you see issues on some systems.
I pushed a tag:
git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream_test
which drops some patches I suspect.
If that helps, pls let me know.
On Mon, Sep 21, 2020 at 08:31:35AM -0400, Michael S. Tsirkin wrote:
> On Mon, Sep 21, 2020 at 07:44:42PM +0800, Li Qiang wrote:
> > Michael S. Tsirkin <mst@redhat.com> 于2020年9月21日周一 下午7:30写道：
> > >
> > > The following changes since commit 053a4177817db307ec854356e95b5b350800a216:
> > >
> > > Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200918' into staging (2020-09-18 16:34:26 +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 acbdbd5db6dab68534702987a487360fd8ae02b7:
> > >
> > > virtio-iommu-pci: force virtio version 1 (2020-09-21 06:14:46 -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
> >
> > Hello Michael,
> > It seems you lost the virtio-pmem patch.
> >
> > https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg02639.html
>
> That's because I was never copied. Can you repost with all tags and Cc
> me?
> Subject can be PATCH repost.
>
> > Anyway, it can be queued in the next pr.
> >
> > Thanks,
> > Li Qiang
On Wed, 23 Sep 2020 at 21:41, Michael S. Tsirkin <mst@redhat.com> wrote: > > Peter, you said you see issues on some systems. > I pushed a tag: > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream_test > which drops some patches I suspect. > If that helps, pls let me know. Yes, the original tag seems to just cause 'make check' to stall out (the logfiles simply stop) for OSX, NetBSD, OpenBSD and s390x. I'll try your test tag... thanks -- PMM
On Thu, 24 Sep 2020 at 11:43, Peter Maydell <peter.maydell@linaro.org> wrote: > > On Wed, 23 Sep 2020 at 21:41, Michael S. Tsirkin <mst@redhat.com> wrote: > > > > Peter, you said you see issues on some systems. > > I pushed a tag: > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream_test > > which drops some patches I suspect. > > If that helps, pls let me know. > > Yes, the original tag seems to just cause 'make check' to stall > out (the logfiles simply stop) for OSX, NetBSD, OpenBSD and > s390x. I'll try your test tag... ...if the test tag works do you want me to merge it? thanks -- PMM
On 9/24/20 12:51 PM, Peter Maydell wrote: > On Thu, 24 Sep 2020 at 11:43, Peter Maydell <peter.maydell@linaro.org> wrote: >> >> On Wed, 23 Sep 2020 at 21:41, Michael S. Tsirkin <mst@redhat.com> wrote: >>> >>> Peter, you said you see issues on some systems. >>> I pushed a tag: >>> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream_test >>> which drops some patches I suspect. >>> If that helps, pls let me know. >> >> Yes, the original tag seems to just cause 'make check' to stall >> out (the logfiles simply stop) for OSX, NetBSD, OpenBSD and >> s390x. I'll try your test tag... > > ...if the test tag works do you want me to merge it? Not very important, but latest commit 8b004b51b9c is mis-squashed. > > thanks > -- PMM >
On Thu, Sep 24, 2020 at 11:51:47AM +0100, Peter Maydell wrote: > On Thu, 24 Sep 2020 at 11:43, Peter Maydell <peter.maydell@linaro.org> wrote: > > > > On Wed, 23 Sep 2020 at 21:41, Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > > Peter, you said you see issues on some systems. > > > I pushed a tag: > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream_test > > > which drops some patches I suspect. > > > If that helps, pls let me know. > > > > Yes, the original tag seems to just cause 'make check' to stall > > out (the logfiles simply stop) for OSX, NetBSD, OpenBSD and > > s390x. I'll try your test tag... > > ...if the test tag works do you want me to merge it? > > thanks > -- PMM I dropped the last patch which was mis-squashed from there and repushed. Not a big deal so either merge that one or this one ... -- MST
On Thu, 24 Sep 2020 at 12:24, Michael S. Tsirkin <mst@redhat.com> wrote: > I dropped the last patch which was mis-squashed from there and repushed. > Not a big deal so either merge that one or this one ... I'm now confused about what tag you want merged. Please resend a cover letter for whatever tag you'd like me to retry. (That's always clearer than just informal email anyway.) thanks -- PMM
The following changes since commit 053a4177817db307ec854356e95b5b350800a216: Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200918' into staging (2020-09-18 16:34:26 +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 acbdbd5db6dab68534702987a487360fd8ae02b7: virtio-iommu-pci: force virtio version 1 (2020-09-21 06:14:46 -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, 812 insertions(+), 323 deletions(-)