- Devel - libvirt List Archives

Re: [PATCH v1 1/3] softmmu/physmem: fallback to opening guest RAM file as readonly in a MAP_PRIVATE mapping
by Peter Xu 11 Aug '23

11 Aug '23

On Fri, Aug 11, 2023 at 06:25:14PM +0200, David Hildenbrand wrote: > On 11.08.23 18:22, Peter Xu wrote: > > On Fri, Aug 11, 2023 at 06:17:05PM +0200, David Hildenbrand wrote: > > > We wouldn't touch "-mem-path". > > > > But still the same issue when someone uses -object memory-backend-file for > > hugetlb, mapping privately, expecting ram discard to work? > > > > Basically I see that example as, "hugetlb" in general made the private > > mapping over RW file usable, so forbidden that anywhere may take a risk. > > These users can be directed to using hugetlb > > a) using MAP_SHARED > b) using memory-backend-memfd, if MAP_PRIVATE is desired > > Am I missing any important use case? Are we being a bit to careful about > virtio-balloon and postcopy simply not being available for these corner > cases? The current immediate issue is not really mem=rw + fd=rw + private case (which was a known issue), but how to make mem=rw + fd=ro + private work for ThinnerBloger, iiuc. I'd just think it safer to expose that cap to solve problem A (vm templating) without affecting problem B (fallcate-over-private not working right), when B is uncertain. I'm also copy Daniel & libvirt list in case there's quick comment from there. Say, maybe libvirt never use private mapping on hugetlb files over memory-backend-file at all, then it's probably fine. In all cases, you and Igor should have the final grasp; no stand on a strong opinon from my side. -- Peter Xu

2 2

[libvirt PATCH] ci: integration: Drop the Fedora 35 check
by Erik Skultety 11 Aug '23

11 Aug '23

We're already past Fedora 35 and so all new fedora's default to modular daemon setup. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- ci/integration-template.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index efd04b76c1..111a115286 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -38,8 +38,7 @@ .enable-libvirt-debugging: &enable-libvirt-debugging - source /etc/os-release # in order to query the vendor-provided variables - - if test "$ID" = "centos" && test "$VERSION_ID" -lt 9 || - test "$ID" = "fedora" && test "$VERSION_ID" -lt 35; + - if test "$ID" = "centos" && test "$VERSION_ID" -lt 9; then DAEMONS="libvirtd virtlockd virtlogd"; else -- 2.41.0

2 1

[PATCH 0/4] migration: Sanitize handling of 'migrate_disks' parameter
by Peter Krempa 09 Aug '23

09 Aug '23

Improve error reporting when users select disk's to migrate but don't enable non-shared storage migration. Peter Krempa (4): qemuMigrationSrcBeginPhase: Properly report error when non-shared storage migration is requested over tunnel qemuMigrationSrcBeginPhase: Require storage migration when 'migrate_disks' parameter is specified virsh: doMigrate: Rework virsh option to migration flag conversion virsh: doMigrate: Require --copy-storage-(all|inc) with --migrate-disks src/qemu/qemu_migration.c | 7 +++ tools/virsh-domain.c | 113 ++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 66 deletions(-) -- 2.41.0

2 8

[PATCH 0/5] introduce support for block device properties
by Kristina Hanicova 09 Aug '23

09 Aug '23

I noticed this on the list after the 1849570 bug on discard granularity: https://listman.redhat.com/archives/libvir-list/2020-June/203862.html so I decided to add maximum unmap size as well. The series is heavily based on Lin's patches and I would be glad if there is any way to add Lin into commit messages as well. Kristina Hanicova (5): conf: add support for discard_granularity qemu: add support for discard_granularity conf: add support for max_unmap_size qemu: Introduce QEMU_CAPS_SCSI_DISK_MAX_UNMAP_SIZE capability qemu: add support for max_unmap_size docs/formatdomain.rst | 16 +++++++- src/conf/domain_conf.c | 22 ++++++++++- src/conf/domain_conf.h | 2 + src/conf/domain_validate.c | 4 +- src/conf/schemas/domaincommon.rng | 10 +++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 ++ src/qemu/qemu_domain.c | 4 ++ src/vz/vz_utils.c | 4 +- .../caps_4.2.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 + .../caps_4.2.0_x86_64.xml | 1 + .../caps_5.0.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1 + .../caps_5.0.0_riscv64.xml | 1 + .../caps_5.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_5.1.0_sparc.xml | 1 + .../caps_5.1.0_x86_64.xml | 1 + .../caps_5.2.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 + .../caps_5.2.0_riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 + .../caps_5.2.0_x86_64.xml | 1 + .../caps_6.0.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 + .../caps_6.0.0_x86_64.xml | 1 + .../caps_6.1.0_x86_64.xml | 1 + .../caps_6.2.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 + .../caps_6.2.0_x86_64.xml | 1 + .../caps_7.0.0_aarch64+hvf.xml | 1 + .../caps_7.0.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 + .../caps_7.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 + .../caps_7.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + .../caps_7.2.0_x86_64+hvf.xml | 1 + .../caps_7.2.0_x86_64.xml | 1 + .../caps_8.0.0_riscv64.xml | 1 + .../caps_8.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + .../caps_8.1.0_x86_64.xml | 1 + .../disk-blockio.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-blockio.xml | 2 +- ...csi-disk-max_unmap_size.x86_64-latest.args | 37 +++++++++++++++++++ .../disk-scsi-disk-max_unmap_size.xml | 28 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + 50 files changed, 168 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.xml -- 2.41.0

3 9

[PATCH] virStorageBackendLogicalCheckPool: Properly mark empty logical pools as active
by Peter Krempa 09 Aug '23

09 Aug '23

The '/dev' filesystem convenience directory for a LVM volume group is not created when the volume group is empty. The logic in 'virStorageBackendLogicalCheckPool' which is used to see whether a pool is active was first checking presence of the directory, which failed for an empty VG. Since the second step is virStorageBackendLogicalMatchPoolSource which is checking mapping between configured PVs and the VG, we can simply rely on the function to also check presence of the pool. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2228223 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/storage/storage_backend_logical.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 9462ac6790..6acbc37f18 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -624,13 +624,7 @@ static int virStorageBackendLogicalCheckPool(virStoragePoolObj *pool, bool *isActive) { - virStoragePoolDef *def = virStoragePoolObjGetDef(pool); - - /* If we can find the target.path as well as ensure that the - * pool's def source - */ - *isActive = virFileExists(def->target.path) && - virStorageBackendLogicalMatchPoolSource(pool); + *isActive = virStorageBackendLogicalMatchPoolSource(pool); return 0; } -- 2.41.0

2 1

[libvirt PATCH v2 00/24] introduce external snapshot revert support
by Pavel Hrdina 08 Aug '23

08 Aug '23

This implements virDomainRevertToSnapshot to work with external snapshots. In addition it modifies virDomainSnapshotDelete to work correctly when we revert to non-leaf snapshot or when there is non-linear snapshot tree with multiple branches. Gitlab repo with the patches: https://gitlab.com/phrdina/libvirt/-/tree/snapshot-revert-external Pavel Hrdina (24): libvirt_private: list virDomainMomentDefPostParse snapshot_conf: export virDomainSnapshotDiskDefClear snapshot_conf: use alternate domain definition in virDomainSnapshotDefAssignExternalNames snapshot_conf: introduce <revertDisks> metadata element snapshot_conf: add new argument to virDomainSnapshotAlignDisks qemu_snapshot: introduce qemuSnapshotDomainDefUpdateDisk qemu_snapshot: use virDomainDiskByName while updating domain def qemu_snapshot: introduce qemuSnapshotCreateQcow2Files qemu_snapshot: allow using alternate domain definition when creating qcow2 files qemu_snapshot: move external disk prepare to single function qemu_snapshot: use VIR_ASYNC_JOB_SNAPSHOT when reverting snapshot qemu_snapshot: introduce external snapshot revert support qemu_snapshot: rename qemuSnapshotDeleteExternalPrepare qemu_snapshot: extract external snapshot delete prepare to function qemu_snapshot: add merge to external snapshot delete prepare data qemu_snapshot: prepare data for non-active leaf external snapshot deletion qemu_snapshot: add support to delete external snapshot without block commit qemu_snapshot: delete: properly update parent snapshot with revert data qemu_snapshot: remove revertdisks when creating new snapshot virdomainmomentobjlist: introduce virDomainMomentIsAncestor qemu_snapshot: update backing store after deleting external snapshot qemu_snapshot: check only once if snapshot is external qemu_snapshot: add checks for external snapshot deletion qemu_snapshot: allow snapshot revert for external snapshots src/conf/schemas/domainsnapshot.rng | 7 + src/conf/snapshot_conf.c | 52 +- src/conf/snapshot_conf.h | 11 +- src/conf/virdomainmomentobjlist.c | 17 + src/conf/virdomainmomentobjlist.h | 4 + src/libvirt_private.syms | 6 + src/qemu/qemu_snapshot.c | 874 ++++++++++++++++++++++------ src/test/test_driver.c | 2 +- 8 files changed, 780 insertions(+), 193 deletions(-) -- 2.41.0

2 38

[PATCH] conf: fix error message
by Anastasia Belova 08 Aug '23

08 Aug '23

From: Анастасия Белова <abelova(a)astralinux.ru> In case of invalid placement its value should be passed as a parameter of virReportError instead of mode. Fixes: 93e82727ec ("numatune: Encapsulate numatune configuration in order to unify results") Signed-off-by: Anastasia Belova <abelova(a)astralinux.ru> --- src/conf/numa_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index a616521763..31b5ea58f6 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -508,7 +508,7 @@ virDomainNumatuneSet(virDomainNuma *numa, (placement < 0 || placement >= VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported numatune placement '%1$d'"), - mode); + placement); return -1; } -- 2.30.2

2 1

[PATCH v2] lxc_container: Increase stack size for lxcContainerChild()
by Michal Privoznik 07 Aug '23

07 Aug '23

When spawning a new container (via clone()) we allocate stack for lxcContainerChild(). So far, we allocate 4 pages for the stack and this used to be enough until we started rewriting everything to glib. With glib we switched to g_strerror() which localizes errno strings and thus increases stack usage, while the previously used strerror_r() was more compact. Fortunately, the solution is easy - just increase how much stack the child can use (16 pages ought to be enough for anybody). And while at it, lets use mmap() for allocation which offer some nice features: MAP_STACK - align allocation to be suitable for stack (even though, currently ignored on Linux), MAP_GROWSDOWN - kernel guards out of bounds access from child Resolves: https://gitlab.com/libvirt/libvirt/-/issues/511 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This is a v2 of: https://listman.redhat.com/archives/libvir-list/2023-August/241127.html diff to v1: - switched from g_new0() to mmap() for additional security src/lxc/lxc_container.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 63cf283285..c215b83848 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -26,6 +26,7 @@ #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/stat.h> +#include <sys/mman.h> #include <unistd.h> #include <mntent.h> #include <sys/reboot.h> @@ -2132,9 +2133,10 @@ int lxcContainerStart(virDomainDef *def, { pid_t pid; int cflags; - int stacksize = getpagesize() * 4; - g_autofree char *stack = NULL; + int stacksize = getpagesize() * 16; + char *stack = NULL; char *stacktop; + int ret = -1; lxc_child_argv_t args = { .config = def, .securityDriver = securityDriver, @@ -2150,7 +2152,14 @@ int lxcContainerStart(virDomainDef *def, }; /* allocate a stack for the container */ - stack = g_new0(char, stacksize); + stack = mmap(NULL, stacksize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_GROWSDOWN | MAP_STACK, + -1, 0); + if (stack == MAP_FAILED) { + virReportSystemError(errno, "%s", + _("Unable to allocate stack")); + return -1; + } stacktop = stack + stacksize; @@ -2160,7 +2169,7 @@ int lxcContainerStart(virDomainDef *def, if (virProcessNamespaceAvailable(VIR_PROCESS_NAMESPACE_USER) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Kernel doesn't support user namespace")); - return -1; + goto cleanup; } VIR_DEBUG("Enable user namespace"); cflags |= CLONE_NEWUSER; @@ -2175,7 +2184,7 @@ int lxcContainerStart(virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Config asks for inherit net namespace " "as well as private network interfaces")); - return -1; + goto cleanup; } VIR_DEBUG("Inheriting a net namespace"); } @@ -2199,10 +2208,16 @@ int lxcContainerStart(virDomainDef *def, if (pid < 0) { virReportSystemError(errno, "%s", _("Failed to run clone container")); - return -1; + goto cleanup; } - return pid; + ret = pid; + cleanup: + if (munmap(stack, stacksize) < 0) { + VIR_WARN("Unable to munmap() stack: %s", g_strerror(errno)); + } + + return ret; } int lxcContainerChown(virDomainDef *def, const char *path) -- 2.41.0

2 1

[PATCH 0/2] libvirt-guests: small improvments
by Jim Fehlig 05 Aug '23

05 Aug '23

The first patch is trivial. I suppose the second is debatable. If I build libvirt with -Dremote_default_mode=legacy but deploy modular daemons, /run/libvirt/libvirt-sock is provided by virtproxyd, which may or may not be running when libvirt-guests starts/stops. I added an 'After=virtproxyd.socket' ordering dependency to libvirt-guests, but it hasn't fixed an issue I'm seeing when using libvirt-guests+virtproxyd libvirt-guests.sh[2607]: Can't connect to default. Skipping I'm still investigating that issue but think the dependency issue is worth discussing independently. Jim Fehlig (2): libvirt-guests: Remove unused variable 'libvirtd' libvirt-guests: Add systemd odering dependency to virtproxyd tools/libvirt-guests.service.in | 1 + tools/libvirt-guests.sh.in | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) -- 2.41.0

3 8

[PATCH] lxc_container: Increase stack size for lxcContainerChild()
by Michal Privoznik 04 Aug '23

04 Aug '23

When spawning a new container (via clone()) we allocate stack for lxcContainerChild(). So far, we allocate 4 pages for the stack and this used to be enough until we started rewriting everything to glib. With glib we switched to g_strerror() which localizes errno strings and thus increases stack usage, while the previously used strerror_r() was more compact. Fortunately, the solution is easy - just increase how much stack the child can use (16 pages ought to be enough for anybody). Resolves: https://gitlab.com/libvirt/libvirt/-/issues/511 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 63cf283285..f741a754ce 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -2132,7 +2132,7 @@ int lxcContainerStart(virDomainDef *def, { pid_t pid; int cflags; - int stacksize = getpagesize() * 4; + int stacksize = getpagesize() * 16; g_autofree char *stack = NULL; char *stacktop; lxc_child_argv_t args = { -- 2.41.0

2 1

[PATCH 00/13] Use struct zero initializer instead of memset
by Michal Privoznik 04 Aug '23

04 Aug '23

This was inspired by Martin's comment here: https://listman.redhat.com/archives/libvir-list/2023-July/241007.html It has sent me down a rabbit hole. But hey, it helped me to identify some needless memset()-s, unused variables, problematic code patterns. Michal Prívozník (13): tools: Fix vshControl declaration and initialization virt-aa-helper: Use struct zero initializer instead of memset Decrease scope of some variables qemu: Don't reuse variable in processSerialChangedEvent() remote_driver: Drop explicit memset(&sargs) in remoteAuthSASL() virfirewalld: Drop useless memset() in virFirewallDApplyRule() virnetlink: Drop unused variable from virNetlinkCommand() securityselinuxhelper: Use g_new0() instead of malloc()+memset() combo virnetclient: Update comment about memset() virnetdaemon.c: Use struct zero initializer instead of memset lib: use struct zero initializer instead of memset lib: Finish using struct zero initializer manually lib: Prefer sizeof(variable) instead of sizeof(type) in memset src/ch/ch_monitor.c | 3 +- src/conf/domain_conf.c | 8 +- src/conf/network_conf.c | 28 ++---- src/cpu/cpu_x86.c | 4 +- src/esx/esx_driver.c | 20 ++--- src/esx/esx_interface_driver.c | 13 +-- src/esx/esx_storage_backend_iscsi.c | 11 +-- src/esx/esx_storage_backend_vmfs.c | 19 ++-- src/esx/esx_util.c | 4 +- src/libxl/libxl_capabilities.c | 4 +- src/libxl/libxl_driver.c | 9 +- src/locking/lock_driver_lockd.c | 19 ++-- src/logging/log_manager.c | 25 ++---- src/lxc/lxc_controller.c | 6 +- src/lxc/lxc_domain.c | 4 +- src/lxc/lxc_driver.c | 4 +- src/nwfilter/nwfilter_dhcpsnoop.c | 4 +- src/nwfilter/nwfilter_gentech_driver.c | 4 +- src/qemu/qemu_agent.c | 10 +-- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 28 +++--- src/qemu/qemu_monitor.c | 10 +-- src/qemu/qemu_monitor_json.c | 11 +-- src/qemu/qemu_process.c | 5 +- src/remote/remote_daemon_dispatch.c | 115 ++++++++----------------- src/remote/remote_daemon_stream.c | 23 ++--- src/remote/remote_driver.c | 23 ++--- src/rpc/virnetclient.c | 4 +- src/rpc/virnetclientprogram.c | 4 +- src/rpc/virnetclientstream.c | 9 +- src/rpc/virnetdaemon.c | 10 +-- src/rpc/virnetsaslcontext.c | 3 +- src/rpc/virnetserverprogram.c | 14 +-- src/rpc/virnetsocket.c | 49 +++-------- src/rpc/virnetsshsession.c | 8 +- src/rpc/virnettlscontext.c | 3 +- src/security/virt-aa-helper.c | 5 +- src/storage/storage_backend_logical.c | 10 +-- src/storage/storage_driver.c | 2 +- src/test/test_driver.c | 4 +- src/util/virarptable.c | 3 +- src/util/virauth.c | 4 +- src/util/virbpf.c | 52 +++-------- src/util/virdevmapper.c | 8 +- src/util/virfdstream.c | 3 +- src/util/virfile.c | 3 +- src/util/virfirewalld.c | 2 - src/util/virinitctl.c | 4 +- src/util/viriscsi.c | 4 +- src/util/virlog.c | 9 +- src/util/virnetdev.c | 8 +- src/util/virnetdevbridge.c | 10 +-- src/util/virnetdevip.c | 8 +- src/util/virnetdevmacvlan.c | 3 +- src/util/virnetdevtap.c | 9 +- src/util/virnetlink.c | 7 +- src/util/virperf.c | 3 +- src/util/virprocess.c | 3 +- src/util/virsocket.c | 6 +- src/util/virsocketaddr.c | 7 +- src/util/viruri.c | 4 +- src/util/virutil.c | 4 +- src/util/viruuid.c | 4 +- src/vbox/vbox_storage.c | 10 +-- src/vmx/vmx.c | 8 +- tests/libxlmock.c | 4 +- tests/nsstest.c | 8 +- tests/nwfilterxml2firewalltest.c | 4 +- tests/qemumonitorjsontest.c | 11 +-- tests/qemumonitortestutils.c | 8 +- tests/qemuxml2argvtest.c | 4 +- tests/securityselinuxhelper.c | 5 +- tests/sockettest.c | 6 +- tests/virhostcputest.c | 3 +- tests/virnetmessagetest.c | 8 +- tests/virnetsockettest.c | 7 +- tools/nss/libvirt_nss.c | 10 +-- tools/virsh-domain-monitor.c | 10 +-- tools/virsh-domain.c | 15 ++-- tools/virsh.c | 7 +- tools/virt-admin.c | 7 +- tools/vsh-table.c | 4 +- 82 files changed, 258 insertions(+), 591 deletions(-) -- 2.41.0

4 31

[PATCH] Fix some typos in documentation and comments
by Stefan Weil 02 Aug '23

02 Aug '23

Signed-off-by: Stefan Weil <sw(a)weilnetz.de> --- This patch was triggered by a spelling check for the generated QEMU documentation using codespell. It does not try to fix all typos which still exist in the QEMU code, but has a focus on those required to fix the documentation. Nevertheless some code comments with the same typos were fixed, too. I think the patch is trivial, so maybe it can still be included in the upcoming release, but that's not strictly necessary. Stefan docs/about/deprecated.rst | 2 +- docs/devel/qom.rst | 2 +- docs/system/devices/nvme.rst | 2 +- hw/core/loader.c | 4 ++-- include/exec/memory.h | 2 +- ui/vnc-enc-tight.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 1c35f55666..92a2bafd2b 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -369,7 +369,7 @@ mapping permissions et al by using its 'mapped' security model option. Nowadays it would make sense to reimplement the ``proxy`` backend by using QEMU's ``vhost`` feature, which would eliminate the high latency costs under which the 9p ``proxy`` backend currently suffers. However as of to date nobody -has indicated plans for such kind of reimplemention unfortunately. +has indicated plans for such kind of reimplementation unfortunately. Block device options diff --git a/docs/devel/qom.rst b/docs/devel/qom.rst index 0b506426d7..9918fac7f2 100644 --- a/docs/devel/qom.rst +++ b/docs/devel/qom.rst @@ -30,7 +30,7 @@ user configuration. Creating a QOM class ==================== -A simple minimal device implementation may look something like bellow: +A simple minimal device implementation may look something like below: .. code-block:: c :caption: Creating a minimal type diff --git a/docs/system/devices/nvme.rst b/docs/system/devices/nvme.rst index a8bb8d729c..2a3af268f7 100644 --- a/docs/system/devices/nvme.rst +++ b/docs/system/devices/nvme.rst @@ -232,7 +232,7 @@ parameters: Set the number of Reclaim Groups. ``fdp.nruh`` (default: ``0``) - Set the number of Reclaim Unit Handles. This is a mandatory paramater and + Set the number of Reclaim Unit Handles. This is a mandatory parameter and must be non-zero. ``fdp.runs`` (default: ``96M``) diff --git a/hw/core/loader.c b/hw/core/loader.c index 8b7fd9e9e5..4dd5a71fb7 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -863,7 +863,7 @@ ssize_t load_image_gzipped(const char *filename, hwaddr addr, uint64_t max_sz) /* * The Linux header magic number for a EFI PE/COFF - * image targetting an unspecified architecture. + * image targeting an unspecified architecture. */ #define EFI_PE_LINUX_MAGIC "\xcd\x23\x82\x81" @@ -1492,7 +1492,7 @@ RomGap rom_find_largest_gap_between(hwaddr base, size_t size) if (rom->mr || rom->fw_file) { continue; } - /* ignore anything finishing bellow base */ + /* ignore anything finishing below base */ if (rom->addr + rom->romsize <= base) { continue; } diff --git a/include/exec/memory.h b/include/exec/memory.h index 7f5c11a0cc..68284428f8 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -942,7 +942,7 @@ struct MemoryListener { * * @listener: The #MemoryListener. * @last_stage: The last stage to synchronize the log during migration. - * The caller should gurantee that the synchronization with true for + * The caller should guarantee that the synchronization with true for * @last_stage is triggered for once after all VCPUs have been stopped. */ void (*log_sync_global)(MemoryListener *listener, bool last_stage); diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index 09200d71b8..ee853dcfcb 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -77,7 +77,7 @@ static int tight_send_framebuffer_update(VncState *vs, int x, int y, #ifdef CONFIG_VNC_JPEG static const struct { - double jpeg_freq_min; /* Don't send JPEG if the freq is bellow */ + double jpeg_freq_min; /* Don't send JPEG if the freq is below */ double jpeg_freq_threshold; /* Always send JPEG if the freq is above */ int jpeg_idx; /* Allow indexed JPEG */ int jpeg_full; /* Allow full color JPEG */ -- 2.39.2

4 4

[libvirt PATCH] src: fix max file limits in systemd services
by Daniel P. Berrangé 02 Aug '23

02 Aug '23

This fixes commit 38abf9c34dc481b0dc923bdab446ee623bdc5ab6 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Wed Jun 21 13:22:40 2023 +0100 src: set max open file limit to match systemd >= 240 defaults The bug referenced in that commit had suggested to set LimitNOFile=512000:1024 on the basis that matches current systemd default behaviour and is compatible with old systemd. That was good except * The setting is LimitNOFILE and these are case sensitive * The hard and soft limits were inverted - soft must come first and so it would have been ignored even if the setting name was correct. * The default hard limit is 524288 not 512000 Reported-by: Olaf Hering <olaf(a)aepfle.de> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/ch/virtchd.service.in | 2 +- src/locking/virtlockd.service.in | 2 +- src/logging/virtlogd.service.in | 2 +- src/lxc/virtlxcd.service.in | 2 +- src/qemu/virtqemud.service.in | 2 +- src/remote/libvirtd.service.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in index be242fea78..351eee312b 100644 --- a/src/ch/virtchd.service.in +++ b/src/ch/virtchd.service.in @@ -24,7 +24,7 @@ Restart=on-failure # Raise hard limits to match behaviour of systemd >= 240. # During startup, daemon will set soft limit to match hard limit # per systemd recommendations -LimitNOFile=512000:1024 +LimitNOFILE=1024:524288 # The cgroups pids controller can limit the number of tasks started by # the daemon, which can limit the number of domains for some hypervisors. # A conservative default of 8 tasks per guest results in a TasksMax of diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in index f1792dcb43..dd0bbab083 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -18,7 +18,7 @@ OOMScoreAdjust=-900 # Raise hard limits to match behaviour of systemd >= 240. # During startup, daemon will set soft limit to match hard limit # per systemd recommendations -LimitNOFile=512000:1024 +LimitNOFILE=1024:524288 [Install] Also=virtlockd.socket diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in index cef4053f59..8e245ddb43 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -18,7 +18,7 @@ OOMScoreAdjust=-900 # Raise hard limits to match behaviour of systemd >= 240. # During startup, daemon will set soft limit to match hard limit # per systemd recommendations -LimitNOFile=512000:1024 +LimitNOFILE=1024:524288 [Install] Also=virtlogd.socket diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in index b615a3f32d..ee3a7f1083 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in @@ -24,7 +24,7 @@ Restart=on-failure # Raise hard limits to match behaviour of systemd >= 240. # During startup, daemon will set soft limit to match hard limit # per systemd recommendations -LimitNOFile=512000:1024 +LimitNOFILE=1024:524288 # The cgroups pids controller can limit the number of tasks started by # the daemon, which can limit the number of domains for some hypervisors. # A conservative default of 8 tasks per guest results in a TasksMax of diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index e3dc738b8f..e79670ca95 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -26,7 +26,7 @@ Restart=on-failure # Raise hard limits to match behaviour of systemd >= 240. # During startup, daemon will set soft limit to match hard limit # per systemd recommendations -LimitNOFile=512000:1024 +LimitNOFILE=1024:524288 # The cgroups pids controller can limit the number of tasks started by # the daemon, which can limit the number of domains for some hypervisors. # A conservative default of 8 tasks per guest results in a TasksMax of diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index abac58cb2c..84f1613adc 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -31,7 +31,7 @@ Restart=on-failure # Raise hard limits to match behaviour of systemd >= 240. # During startup, daemon will set soft limit to match hard limit # per systemd recommendations -LimitNOFile=512000:1024 +LimitNOFILE=1024:524288 # The cgroups pids controller can limit the number of tasks started by # the daemon, which can limit the number of domains for some hypervisors. # A conservative default of 8 tasks per guest results in a TasksMax of -- 2.41.0

2 1

[PATCH] daemon: Treat logging of VIR_ERR_MULTIPLE_INTERFACES same as VIR_ERR_NO_INTERFACE
by Peter Krempa 02 Aug '23

02 Aug '23

When a query for an interface via virInterfaceLookupByMACString finds multiple interfaces an error is returned. Treat such error with the same 'debug' priority as we treat when the interface was not found to avoid spamming logs with such configurations. Closes: https://gitlab.com/libvirt/libvirt/-/issues/514 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/remote/remote_daemon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index d880711c91..d4d999e53a 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -97,6 +97,7 @@ static int daemonErrorLogFilter(virErrorPtr err, int priority) case VIR_ERR_NO_STORAGE_VOL: case VIR_ERR_NO_NODE_DEVICE: case VIR_ERR_NO_INTERFACE: + case VIR_ERR_MULTIPLE_INTERFACES: case VIR_ERR_NO_NWFILTER: case VIR_ERR_NO_NWFILTER_BINDING: case VIR_ERR_NO_SECRET: -- 2.41.0

2 1

[PATCH 0/3] lxc: Fix reporting of startup errors with debug logging enabled
by Peter Krempa 02 Aug '23

02 Aug '23

Few issues with propagating error to the user when debug logging is enabled, Peter Krempa (3): virLXCControllerSetupUsernsMap: Modify debug logging for clean startup errors virLXCProcessReadLogOutputData: Refill buffer after filtering out noise virLXCProcessReportStartupLogError: Strip trailing newline from error src/lxc/lxc_controller.c | 8 +++++--- src/lxc/lxc_process.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) -- 2.41.0

2 4

[PATCH 0/2] qemu_passt: Stop pre-creating passt logfile
by Michal Privoznik 02 Aug '23

02 Aug '23

See reasoning in 2/2. Michal Prívozník (2): Revert "qemu_passt: Actually use @logfd" Revert "qemu_passt: Precreate passt logfile" src/qemu/qemu_passt.c | 40 +++++----------------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) -- 2.41.0

2 3

[PATCH RFC 0/3] Reflect MAC change in live domain XML
by Michal Privoznik 02 Aug '23

02 Aug '23

These are RFC patches. I'd like to start a discussion on the following problem: A mgmt application has info tied to an <interface/> (stored elsewhere, not important right now). And they use basically the only piece of information that's visible in both host and guest: MAC address. No, user aliases are not visible in the guest. Therefore, when they query the guest-agent (e.g. via 'virsh domifaddr --source agent') they can reconstruct their knowledge on NICs. But there's a catch - if user decides to change MAC address form inside of the VM. Then the only link between host and guest is broken. Now, we could make the guest-agent report both current and permanent MAC address. But unfortunately, libvirt's virDomainInterfaceAddresses() is not prepared for that. Now, I don't recall why we decided to not update MAC address in the live XML on change, but maybe somebody else does. Or we can pass the event from QEMU to the mgmt application so that it can update its state. Michal Prívozník (3): qemu: Reflect MAC address change in live domain XML Introduce NIC_MAC_CHANGE event qemu: Emit NIC_MAC_CHANGE event examples/c/misc/event-test.c | 14 +++++ include/libvirt/libvirt-domain.h | 28 +++++++++ src/conf/domain_event.c | 93 +++++++++++++++++++++++++++++ src/conf/domain_event.h | 12 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_domain.c | 34 ++++++++++- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 11 ++-- src/qemu/qemu_process.c | 2 +- src/remote/remote_daemon_dispatch.c | 32 ++++++++++ src/remote/remote_driver.c | 34 +++++++++++ src/remote/remote_protocol.x | 17 +++++- tools/virsh-domain-event.c | 20 +++++++ 13 files changed, 294 insertions(+), 8 deletions(-) -- 2.39.3

3 9

[libvirt PATCH 0/9] src: some improvements to systemd unit files
by Daniel P. Berrangé 02 Aug '23

02 Aug '23

These were suggested by Lennart in https://gitlab.com/libvirt/libvirt/-/issues/489 Daniel P. Berrangé (9): src: remove After=local-fs.target from systemd units src: remote deps on ip[6]tables/firewalld.service from systemd units util: remove pointless wrappers for setrlimit/getrlimit util: add helper for raising the max files limit rpc: automatically raise max file limit in all daemons src: set max open file limit to match systemd >= 240 defaults util: relax requirement for logind to be running src: remove dep on systemd-logind.service from unit files util: add logging about node suspend availability src/ch/virtchd.service.in | 11 ++--- src/interface/virtinterfaced.service.in | 1 - src/libvirt_private.syms | 1 + src/libxl/virtxend.service.in | 1 - src/locking/virtlockd.service.in | 8 ++-- src/logging/virtlogd.service.in | 11 ++--- src/lxc/virtlxcd.service.in | 11 ++--- src/network/virtnetworkd.service.in | 4 -- src/node_device/virtnodedevd.service.in | 1 - src/nwfilter/virtnwfilterd.service.in | 1 - src/qemu/virtqemud.service.in | 11 ++--- src/remote/libvirtd.service.in | 14 ++----- src/remote/virtproxyd.service.in | 1 - src/rpc/virnetdaemon.c | 3 ++ src/secret/virtsecretd.service.in | 1 - src/storage/virtstoraged.service.in | 1 - src/util/virnodesuspend.c | 3 ++ src/util/virprocess.c | 56 ++++++++++++++++--------- src/util/virprocess.h | 1 + src/util/virstring.c | 6 +++ src/util/virsystemd.c | 12 ++++++ src/vbox/virtvboxd.service.in | 1 - src/vz/virtvzd.service.in | 1 - tests/virshtest.c | 1 + tools/virsh.c | 2 +- 25 files changed, 88 insertions(+), 76 deletions(-) -- 2.40.1

4 26

Release of libvirt-9.6.0
by Jiri Denemark 01 Aug '23

01 Aug '23

The 9.6.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://download.libvirt.org/ https://download.libvirt.org/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * Security * ``CVE-2023-3750``: Fix race condition in storage driver leading to a crash In libvirt-8.3 a bug was introduced which in rare cases could cause ``libvirtd`` or ``virtstoraged`` to crash if multiple clients attempted to look up a storage volume by key, path or target path, while other clients attempted to access something from the same storage pool. * Improvements * apparmor: All profiles and abstractions now support local overrides This has long been the case for the ``virt-aa-helper`` profile, but has now been extended to all other profiles and abstractions. The mechanism used is the standard AppArmor 3.x one, where the contents of ``foo`` and ``abstractions/foo`` can be overridden by creating ``local/foo`` and ``abstractions/foo.d`` respectively. * qemu: Support ``removable`` attribute for scsi disk Now the scsi disk device (``/disk@device='disk'`` and ``/disk/target@bus='scsi'``) supports the ``removable`` attribute at ``/disk/target@removable```. * qemu: Add NUMA node automatically for memory hotplug Users no longer need to specify guest NUMA node in the domain XML when enabling memory hotplug, libvirt automatically adds one when it is missing. * qemu: Consider ``BeeGFS`` as a shared filesystem Allow migration with non-shared storage for VMs accessing storage via ``BeeGFS``. * Bug fixes * qemu: Adapt to new way of specifying PC speaker PC speaker is now usable again with newer QEMU since the change of how it is specified on the command line. * qemu_tpm: Try harder to create emulator state Libvirt no longer considers empty directory valid SWTPM state and setup is now run properly in such case. Enjoy. Jirka

1 0

[PATCH] NEWS: Mention CVE-2023-3750 and BeeGFS migration support
by Peter Krempa 01 Aug '23

01 Aug '23

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 8f0c67f779..e31448e829 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -13,6 +13,13 @@ v9.6.0 (unreleased) * **Security** + * ``CVE-2023-3750``: Fix race condition in storage driver leading to a crash + + In **libvirt-8.3** a bug was introduced which in rare cases could cause + ``libvirtd`` or ``virtstoraged`` to crash if multiple clients attempted to + look up a storage volume by key, path or target path, while other clients + attempted to access something from the same storage pool. + * **Removed features** * **New features** @@ -38,6 +45,11 @@ v9.6.0 (unreleased) Users no longer need to specify guest NUMA node in the domain XML when enabling memory hotplug, libvirt automatically adds one when it is missing. + * qemu: Consider ``BeeGFS`` as a shared filesystem + + Allow migration with non-shared storage for VMs accessing storage via + ``BeeGFS``. + * **Bug fixes** * qemu: Adapt to new way of specifying PC speaker -- 2.41.0

2 1

[PATCH Libvirt 00/11] Support dirty page rate upper limit
by ~hyman 01 Aug '23

01 Aug '23

QEMU introduced the dirty page rate limit feature in 7.1.0, see the details in the following link: https://lore.kernel.org/qemu- devel/cover.1656177590.git.huangy81(a)chinatelecom.cn/ So maybe it's the right time to enable this feature in libvirt and the upper user can play with it, expecting the upper app can use this feature to do a virtual CPU Qos or whatever else. Introduce the virsh API as follows: # virsh limit-dirty-page-rate <domain> [--rate <number>] [--vcpu <number>] [--cancel] Examples: To set the dirty page rate upper limit 60MB/s for all virtual CPUs in c81_node1, use: # virsh limit-dirty-page-rate c81_node1 --rate 60 Set dirty page rate limit 60(MB/s) on all virtual CPUs successfully To set the dirty page rate upper limit 35MB/s for virtual CPU 1 in c81_node1, use: # virsh limit-dirty-page-rate c81_node1 --rate 35 --vcpu 1 Set vcpu[1] dirty page rate upper limit 35(MB/s) successfully Specify the 'cancel' option to do the reverse, the optional option 'vcpu' is used to specify the CPU index to be set. To query the dirty page rate upper limit, use: # virsh vcpuinfo c81_node1 VCPU: 0 CPU: 14 State: running CPU time: 27.1s CPU Affinity: yyyyyyyyyyyyyyyy DirtyRate limit: 60 DirtyRate current: 0 VCPU: 1 CPU: 1 State: running CPU time: 25.1s CPU Affinity: yyyyyyyyyyyyyyyy DirtyRate limit: 35 DirtyRate current: 0 VCPU: 2 CPU: 7 State: running CPU time: 6.0s CPU Affinity: yyyyyyyyyyyyyyyy DirtyRate limit: 60 DirtyRate current: 0 VCPU: 3 CPU: 8 State: running CPU time: 3.5s CPU Affinity: yyyyyyyyyyyyyyyy DirtyRate limit: 60 DirtyRate current: 0 The patch set adds two new APIs to implement a dirty page rate limit: 1. virDomainSetVcpuDirtyLimit, which set virtual CPU dirty page rate limit. virsh command 'limit-dirty-page-rate' correspondingly. 2. virDomainCancelVcpuDirtyLimit, which cancel virtual CPU dirty page rate limit. 'cancel' option was introduced to 'limit-dirty-page-rate' to cancel the limit correspondingly. In addition, function 'qemuMonitorQueryVcpuDirtyLimit' was implemented to query the dirty page rate upper limit, the virsh command 'vcpuinfo' was extended. So that the user can query dirty page rate limit info via 'vcpuinfo'. This series makes the main modifications as follows: - introduce QEMU_CAPS_VCPU_DIRTY_LIMIT capability so that libvirt can probe before using dirty page rate upper limit feature. - implement virsh command 'limit-dirty-page-rate' to set/cancel dirty page rate upper limit. - extend 'vcpuinfo' API so that it can display dirty page rate upper limit. - document dirty page rate limit feature. Please review, and hoping the comments, thanks ! Yong Hyman Huang(黄勇) (11): qemu_capabilities: Introduce QEMU_CAPS_VCPU_DIRTY_LIMIT capability libvirt: Add virDomainSetVcpuDirtyLimit API qemu_driver: Implement qemuDomainSetVcpuDirtyLimit virsh: Introduce limit-dirty-page-rate api qemu_monitor: Implement qemuMonitorQueryVcpuDirtyLimit qemu_driver: Extend qemuDomainGetVcpus virsh: Extend vcpuinfo api libvirt: Add virDomainCancelVcpuDirtyLimit API qemu_driver: Implement qemuDomainCancelVcpuDirtyLimit virsh: Add cancel option of limit-dirty-page-rate api NEWS: Document limit dirty page rate APIs NEWS.rst | 16 ++ include/libvirt/libvirt-domain.h | 22 +++ src/driver-hypervisor.h | 13 ++ src/libvirt-domain.c | 106 ++++++++++++ src/libvirt_public.syms | 6 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 154 ++++++++++++++++++ src/qemu/qemu_monitor.c | 36 ++++ src/qemu/qemu_monitor.h | 26 +++ src/qemu/qemu_monitor_json.c | 150 +++++++++++++++++ src/qemu/qemu_monitor_json.h | 13 ++ src/remote/remote_daemon_dispatch.c | 2 + src/remote/remote_driver.c | 4 + src/remote/remote_protocol.x | 28 +++- src/remote_protocol-structs | 13 ++ .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 + .../caps_7.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + .../caps_7.2.0_x86_64+hvf.xml | 1 + .../caps_7.2.0_x86_64.xml | 1 + .../caps_8.0.0_riscv64.xml | 1 + .../caps_8.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + .../caps_8.1.0_x86_64.xml | 1 + tools/virsh-domain.c | 123 ++++++++++++++ 26 files changed, 723 insertions(+), 1 deletion(-) -- 2.38.5

3 17

[PATCH v2] NEWS: Document my contributions for upcoming release
by Michal Privoznik 31 Jul '23

31 Jul '23

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2023-July/241020.html diff to v2: - Reworded, basically every paragraph, to make them sound more user friendly. Thanks Martin for his suggestions! NEWS.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 1de8314a61..8f0c67f779 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -33,8 +33,23 @@ v9.6.0 (unreleased) ``/disk/target@bus='scsi'``) supports the ``removable`` attribute at ``/disk/target@removable```. + * qemu: Add NUMA node automatically for memory hotplug + + Users no longer need to specify guest NUMA node in the domain XML when + enabling memory hotplug, libvirt automatically adds one when it is missing. + * **Bug fixes** + * qemu: Adapt to new way of specifying PC speaker + + PC speaker is now usable again with newer QEMU since the change of how it + is specified on the command line. + + * qemu_tpm: Try harder to create emulator state + + Libvirt no longer considers empty directory valid SWTPM state and setup is + now run properly in such case. + v9.5.0 (2023-07-03) =================== -- 2.41.0

2 1

[PATCH] NEWS: Document my contributions for upcoming release
by Michal Privoznik 31 Jul '23

31 Jul '23

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- NEWS.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 1de8314a61..0dc909c849 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -33,8 +33,25 @@ v9.6.0 (unreleased) ``/disk/target@bus='scsi'``) supports the ``removable`` attribute at ``/disk/target@removable```. + * qemu: Add NUMA node automatically for memory hotplug + + When enabling memory hotplug, libvirt required at least one guest NUMA to + be specified in the domain XML. With this release, libvirt adds it + automatically when needed. + * **Bug fixes** + * qemu: Adapt to new way of specifying PC speaker + + Because the way PC speaker is specified on QEMU command line changed, + libvirt was unable to start a domain with PC speaker. This is now fixed. + + * qemu_tpm: Try harder to create emulator state + + If a per-domain SWTPM state directory exists but is empty libvirt would + consider it a valid state and skipped running 'swtpm_setup'. This is now + fixed. + v9.5.0 (2023-07-03) =================== -- 2.41.0

3 2

[PATCH 00/26] Migration PULL 2023-07-24
by Juan Quintela 31 Jul '23

31 Jul '23

Hi This is the migration PULL request. It has: - Fabiano rosas trheadinfo cleanups - Hyman Huang dirtylimit changes - Part of my changes - Peter Xu documentation - Tejus updato to migration descriptions - Wei want improvements for postocpy and multifd setup Please apply. Now a not on CI, thas has been really bad. After too many problems with last PULLS, I decided to learn to use qemu CI. On one hand, it is not so difficult, even I can use it O:-) On the other hand, the amount of problems that I got is inmense. Some of them dissapear when I rerun the checks, but I never know if it is my PULL request, the CI system or the tests themselves. So it ends going something like: while (true); do - git pull - git rebase - git push ci blah, blah - Next day cames, and too many errors, so I rebase again The last step takes more time than expected and not always trivial to know how the failure is. This (last) patch is not part of the PULL request, but I have found that it _always_ makes gcov fail. I had to use bisect to find where the problem was. https://gitlab.com/juan.quintela/qemu/-/jobs/4571878922 I could use help to know how a change in test/qtest/migration-test.c can break block layer tests, I am all ears. Yes, I tried several times. It always fails on that patch. The passes with flying colors. Later, Juan. Fabiano Rosas (2): migration/multifd: Rename threadinfo.c functions migration/multifd: Protect accesses to migration_threads Hyman Huang(黄勇) (8): softmmu/dirtylimit: Add parameter check for hmp "set_vcpu_dirty_limit" qapi/migration: Introduce x-vcpu-dirty-limit-period parameter qapi/migration: Introduce vcpu-dirty-limit parameters migration: Introduce dirty-limit capability migration: Refactor auto-converge capability logic migration: Put the detection logic before auto-converge checking migration: Implement dirty-limit convergence algo migration: Extend query-migrate to provide dirty page limit info Juan Quintela (12): migration-test: Be consistent for ppc migration-test: Make machine_opts regular with other options migration-test: Create arch_opts migration-test: machine_opts is really arch specific migration.json: Don't use space before colon migration: skipped field is really obsolete. qemu-file: Rename qemu_file_transferred_ fast -> noflush migration: Change qemu_file_transferred to noflush qemu_file: Make qemu_file_is_writable() static qemu-file: Simplify qemu_file_shutdown() qemu-file: Make qemu_file_get_error_obj() static migration/rdma: Split qemu_fopen_rdma() into input/output functions Peter Xu (1): docs/migration: Update postcopy bits Tejus GK (1): migration: Update error description whenever migration fails Wei Wang (2): migration: enforce multifd and postcopy preempt to be set before incoming qtest/migration-tests.c: use "-incoming defer" for postcopy tests docs/about/deprecated.rst | 10 +++ docs/devel/migration.rst | 94 ++++++++++++++++++++--------- qapi/migration.json | 107 ++++++++++++++++++++++++++------- include/sysemu/dirtylimit.h | 2 + migration/options.h | 1 + migration/qemu-file.h | 14 ++--- migration/threadinfo.h | 7 +-- migration/migration-hmp-cmds.c | 26 ++++++++ migration/migration.c | 36 ++++++++--- migration/multifd.c | 4 +- migration/options.c | 87 ++++++++++++++++++++++++++- migration/qemu-file.c | 24 ++------ migration/ram.c | 59 +++++++++++++++--- migration/rdma.c | 39 ++++++------ migration/savevm.c | 6 +- migration/threadinfo.c | 19 +++++- migration/vmstate.c | 4 +- softmmu/dirtylimit.c | 97 +++++++++++++++++++++++++++--- tests/qtest/migration-test.c | 48 +++++++-------- migration/trace-events | 1 + 20 files changed, 520 insertions(+), 165 deletions(-) -- 2.40.1

3 29

Entering freeze for libvirt-9.6.0
by Jiri Denemark 28 Jul '23

28 Jul '23

I have just tagged v9.6.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://download.libvirt.org/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 1

[PATCH 0/3] Update the capability and doc for device igb
by Han Han 28 Jul '23

28 Jul '23

The interface model igb is added since v9.3.0, but the qemu capability and qemu supported version is missing. So I add them in this series. Han Han (3): docs: formatdomain: Mention the QEMU version for igb qemu: capabilities: Add the capability for the device igb qemu/qemu_validate: Add capability check for the model igb docs/formatdomain.rst | 2 +- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_validate.c | 7 +++++++ tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 + 6 files changed, 13 insertions(+), 1 deletion(-) -- 2.41.0

3 6

[libvirt PATCH 0/8] rpm: Fix handling of systemd units
by Andrea Bolognani 27 Jul '23

27 Jul '23

Plus some extras I'm throwing in for free :) To understand why these changes are needed, see the original bug report[1] as well as the discussion triggered by Martin's initial attempt at addressing it[2]. Getting this right is quite tricky, so in order to convince myself that I'm not just going to break everyone's deployment I've tested things fairly extensively. In particular, I've verified that things work as expected when upgrading from libvirt 9.0.0 (e.g. pre-split) on AlmaLinux 8 when the initial configuration is * a default one (socket-activated monolithic daemon); * monolithic daemon with --listen; * modular daemons; * modular daemons with virtproxyd-tcp.socket enabled; as well as when installing from scratch with * no particular configuration; * local systemd preset overrides that result in the modular daemons being preferred to the monolithic one. Everything seems to work fine, but further testing would certainly be more than welcome! [1] https://bugzilla.redhat.com/show_bug.cgi?id=2210058 [2] https://listman.redhat.com/archives/libvir-list/2023-June/240226.html Andrea Bolognani (8): rpm: Bump min_fedora rpm: Style/alignment tweaks rpm: Reorder scriptlets rpm: Reduce use of with_modular_daemons rpm: Remove custom libvirtd restart logic rpm: Introduce new macros for handling of systemd units rpm: Switch to new macros for handling of systemd units rpm: Delete unused macros libvirt.spec.in | 453 +++++++++++++++++++++++++----------------------- 1 file changed, 232 insertions(+), 221 deletions(-) -- 2.41.0

3 31

[PATCH] qemu: don't add --mac-addr option to passt commandline
by Laine Stump 27 Jul '23

27 Jul '23

When I implemented passt support in libvirt, I saw the --mac-addr option on the passt commandline, immediately assumed that this was used for setting the guest interface's mac address somewhere within passt, and read no further. As a result, "--mac-addr" is always added to the passt commandline, specifying the setting from <mac addr='blah'/> in the guest's interface config. But as pointed out in this bugzilla comment: https://bugzilla.redhat.com/2184967#c8 That is *not at all* what passt's --mac-addr option does. Instead, it is used to force the *remote* mac address for incoming traffic to a specific value. So setting --mac-addr results in all traffic on the interface having the same (the guest's) mac address for both source and destination in all traffic. Surprisingly, this still works, so nobody noticed it during testing. The proper thing is to not specify any mac address to passt - the remote MAC addresses can and should remain untouched, and the local MAC address will end up being known to passt and beyond just by the guest sending out packets with that MAC address. Reported-by: Laszlo Ersek <lersek(a)redhat.com> Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/qemu/qemu_passt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c index 3679bf75fc..d36856e92e 100644 --- a/src/qemu/qemu_passt.c +++ b/src/qemu/qemu_passt.c @@ -176,7 +176,6 @@ qemuPasstStart(virDomainObj *vm, g_autofree char *passtSocketName = qemuPasstCreateSocketPath(vm, net); g_autoptr(virCommand) cmd = NULL; g_autofree char *pidfile = qemuPasstCreatePidFilename(vm, net); - char macaddr[VIR_MAC_STRING_BUFLEN]; bool needUnlink = false; size_t i; @@ -187,7 +186,6 @@ qemuPasstStart(virDomainObj *vm, virCommandAddArgList(cmd, "--one-off", "--socket", passtSocketName, - "--mac-addr", virMacAddrFormat(&net->mac, macaddr), "--pid", pidfile, NULL); -- 2.41.0

3 4

[PULL 00/25] Migration 20230726 patches
by Juan Quintela 26 Jul '23

26 Jul '23

The following changes since commit 6cb2011fedf8c4e7b66b4a3abd6b42c1bae99ce6: Update version for v8.1.0-rc1 release (2023-07-25 20:09:05 +0100) are available in the Git repository at: https://gitlab.com/juan.quintela/qemu.git tags/migration-20230726-pull-request for you to fetch changes up to 697c4c86ab515a728ffb2adc2c3c04b22fa9210f: migration/rdma: Split qemu_fopen_rdma() into input/output functions (2023-07-26 10:55:56 +0200) ---------------------------------------------------------------- Migration Pull request Hi This is the migration PULL request. It is the same than yesterday with proper PULL headers. It pass CI. It contains: - Fabiano rosas trheadinfo cleanups - Hyman Huang dirtylimit changes - Part of my changes - Peter Xu documentation - Tejus updato to migration descriptions - Wei want improvements for postocpy and multifd setup Please apply. Thanks, Juan. ---------------------------------------------------------------- Fabiano Rosas (2): migration/multifd: Rename threadinfo.c functions migration/multifd: Protect accesses to migration_threads Hyman Huang(黄勇) (8): softmmu/dirtylimit: Add parameter check for hmp "set_vcpu_dirty_limit" qapi/migration: Introduce x-vcpu-dirty-limit-period parameter qapi/migration: Introduce vcpu-dirty-limit parameters migration: Introduce dirty-limit capability migration: Refactor auto-converge capability logic migration: Put the detection logic before auto-converge checking migration: Implement dirty-limit convergence algo migration: Extend query-migrate to provide dirty page limit info Juan Quintela (11): migration-test: Be consistent for ppc migration-test: Make machine_opts regular with other options migration-test: Create arch_opts migration-test: machine_opts is really arch specific migration: skipped field is really obsolete. qemu-file: Rename qemu_file_transferred_ fast -> noflush migration: Change qemu_file_transferred to noflush qemu_file: Make qemu_file_is_writable() static qemu-file: Simplify qemu_file_shutdown() qemu-file: Make qemu_file_get_error_obj() static migration/rdma: Split qemu_fopen_rdma() into input/output functions Peter Xu (1): docs/migration: Update postcopy bits Tejus GK (1): migration: Update error description whenever migration fails Wei Wang (2): migration: enforce multifd and postcopy preempt to be set before incoming qtest/migration-tests.c: use "-incoming defer" for postcopy tests docs/about/deprecated.rst | 10 ++++ docs/devel/migration.rst | 94 ++++++++++++++++++++++---------- qapi/migration.json | 87 ++++++++++++++++++++++++++---- include/sysemu/dirtylimit.h | 2 + migration/options.h | 1 + migration/qemu-file.h | 14 ++--- migration/threadinfo.h | 7 +-- migration/migration-hmp-cmds.c | 26 +++++++++ migration/migration.c | 36 +++++++++---- migration/multifd.c | 4 +- migration/options.c | 87 +++++++++++++++++++++++++++++- migration/qemu-file.c | 24 ++------- migration/ram.c | 59 +++++++++++++++++---- migration/rdma.c | 39 +++++++------- migration/savevm.c | 6 +-- migration/threadinfo.c | 19 +++++-- migration/vmstate.c | 4 +- softmmu/dirtylimit.c | 97 ++++++++++++++++++++++++++++++---- tests/qtest/migration-test.c | 48 ++++++++--------- migration/trace-events | 1 + 20 files changed, 510 insertions(+), 155 deletions(-) -- 2.40.1

2 26

[PATCH] remote: handle partial data transmission
by Oleg Vasilev 26 Jul '23

26 Jul '23

A new bug was introduced as a part of use-after-free fix below: commit 411cbe7199ce533ae5fa78f5558dddca6f88ef1a Author: Oleg Vasilev <oleg.vasilev(a)virtuozzo.com> Date: Tue Jul 4 13:10:22 2023 +0600 remote: fix stream use-after-free When the message was processed partially, it is actually supposed to stay in the queue to be processed again. In such case, reinsert it back. Signed-off-by: Oleg Vasilev <oleg.vasilev(a)virtuozzo.com> --- src/remote/remote_daemon_stream.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c index 345c40b48c..f52af790c1 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -775,8 +775,12 @@ daemonStreamHandleWrite(virNetServerClient *client, ret = -1; } - if (ret > 0) - break; /* still processing data from msg */ + if (ret > 0) { + /* still processing data from msg, put it back into queue */ + msg->next = stream->rx; + stream->rx = msg; + break; + } if (ret < 0) { virNetMessageFree(msg); -- 2.41.0

2 1

[PATCH] docs: formatdomain: Mention the QEMU requirement for discard_no_unref
by Han Han 26 Jul '23

26 Jul '23

Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/formatdomain.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 973de8dd4f..cd9cb02bf8 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3296,7 +3296,8 @@ paravirtualized driver is specified via the ``disk`` element. image. When enabled, a discard request from within the guest will mark the qcow2 cluster as zero, but will keep the reference/offset of that cluster. But it will still pass the discard further to the lower layer. - This will resolve fragmentation within the qcow2 image. :since:`Since 9.5.0` + This will resolve fragmentation within the qcow2 image. :since:`Since 9.5.0 + (QEMU 8.1)` In the majority of cases the default configuration used by the hypervisor is sufficient so modifying this setting should not be necessary. For -- 2.41.0

2 2

[libvirt PATCH v2] run: add ability to set selinux context
by Jonathon Jongsma 25 Jul '23

25 Jul '23

When running libvirt from the build directory with the 'run' script, it will run as unconfined_t. This can result in unexpected behavior when selinux is enforcing due to the fact that the selinux policies are written assuming that libvirt is running with the system_u:system_r:virtd_t context. This patch adds a new --selinux option to the run script. When this option is specified, it will launch the specified binary using the 'runcon' utility to set its selinux context to the one mentioned above. Since this may require root privileges, setting the selinux context is not the default behavior and must be enabled with the command line switch. Note that this uses argparse to parse the new option, but it does so in a very limited way in order to avoid interfering with any arguments that the user might want to pass on to libvirt. For example, we do not provide a `--help` option for the run script. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- I sent a version of this a couple months ago and Erik made a few comments and then I kind of forgot about it for a little while. Re-sending now with a couple minor changes changes in v2: - rebased to master - fixed to properly restore context of binary after execution if the systemd unit file is not currently running. - disabled abbreviated versions of options run.in | 100 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 80 insertions(+), 20 deletions(-) diff --git a/run.in b/run.in index c6d3411082..869f074d71 100644 --- a/run.in +++ b/run.in @@ -40,9 +40,11 @@ # # ---------------------------------------------------------------------- +import argparse import os import os.path import random +import shutil import signal import sys import subprocess @@ -59,15 +61,20 @@ def prepend(env, varname, extradir): here = "@abs_builddir@" -if len(sys.argv) < 2: - print("syntax: %s BINARY [ARGS...]" % sys.argv[0], file=sys.stderr) +parser = argparse.ArgumentParser(add_help=False, allow_abbrev=False) +parser.add_argument('--selinux', + action='store_true', + help='Run in the appropriate selinux context') + +opts, args = parser.parse_known_args() + +if len(args) < 1: + print("syntax: %s [--selinux] BINARY [ARGS...]" % sys.argv[0], file=sys.stderr) sys.exit(1) -prog = sys.argv[1] -args = sys.argv[1:] +prog = args[0] env = os.environ - prepend(env, "LD_LIBRARY_PATH", os.path.join(here, "src")) prepend(env, "PKG_CONFIG_PATH", os.path.join(here, "src")) prepend(env, "PATH", os.path.join(here, "tools")) @@ -130,10 +137,25 @@ def change_unit(name, action): return ret == 0 +def chcon(path, user, role, type): + print("Setting file context of {} to u={}, r={}, t={}...".format(progpath, + user, + role, + type)) + ret = subprocess.call(["chcon", "-u", user, "-r", role, "-t", type, path]) + return ret == 0 + + +def restorecon(path): + print("Restoring selinux context for {}...".format(path)) + ret = subprocess.call(["restorecon", path]) + return ret == 0 + + try_stop_units = [] if is_systemd_host(): maybe_stopped_units = [] - for arg in sys.argv: + for arg in args: name = os.path.basename(arg) if is_modular_daemon(name): # Only need to stop libvirtd or this specific modular unit @@ -149,11 +171,10 @@ if is_systemd_host(): if is_unit_active(unit): try_stop_units.append(unit) -if len(try_stop_units) == 0: +if len(try_stop_units) == 0 and not opts.selinux: # Run the program directly, replacing ourselves os.execvpe(prog, args, env) else: - print("Temporarily stopping systemd units...") stopped_units = [] def sighandler(signum, frame): @@ -164,12 +185,48 @@ else: signal.signal(signal.SIGQUIT, sighandler) try: - for unit in try_stop_units: - print(" > %s" % unit) - if not change_unit(unit, "stop"): - raise Exception("Unable to stop '%s'" % unit) - - stopped_units.append(unit) + dorestorecon = False + progpath = shutil.which(prog) + if len(try_stop_units): + print("Temporarily stopping systemd units...") + + for unit in try_stop_units: + print(" > %s" % unit) + if not change_unit(unit, "stop"): + raise Exception("Unable to stop '%s'" % unit) + + stopped_units.append(unit) + + if opts.selinux: + # if using a wrapper command like 'gdb', setting the selinux + # context won't work because the wrapper command will not be a + # valid entrypoint for the virtd_t context + if os.path.basename(prog) not in ["libvirtd", *modular_daemons]: + raise Exception("'{}' is not recognized as a valid daemon. " + "Selinux process context can only be set when " + "executing a daemon directly without wrapper " + "commands".format(prog)) + + if not progpath: + raise Exception("Can't find executable {} for selinux labeling" + .format(prog)) + + if not progpath.startswith(os.path.abspath(here)): + raise Exception("Refusing to change selinux context of file " + "'{}' outside build directory" + .format(progpath)) + + # selinux won't allow us to transition to the virtd_t context from + # e.g. the user_home_t context (the likely label of the local + # executable file) + if not chcon(progpath, "system_u", "object_r", "virtd_exec_t"): + raise Exception("Failed to change selinux context of binary") + dorestorecon = True + + args = ['runcon', + '-u', 'system_u', + '-r', 'system_r', + '-t', 'virtd_t', *args] print("Running '%s'..." % str(" ".join(args))) ret = subprocess.call(args, env=env) @@ -178,9 +235,12 @@ else: except Exception as e: print("%s" % e, file=sys.stderr) finally: - print("Re-starting original systemd units...") - stopped_units.reverse() - for unit in stopped_units: - print(" > %s" % unit) - if not change_unit(unit, "start"): - print(" ! unable to restart %s" % unit, file=sys.stderr) + if len(stopped_units): + print("Re-starting original systemd units...") + stopped_units.reverse() + for unit in stopped_units: + print(" > %s" % unit) + if not change_unit(unit, "start"): + print(" ! unable to restart %s" % unit, file=sys.stderr) + if dorestorecon: + restorecon(progpath) -- 2.40.1

2 1

Re: [libvirt PATCH v2 05/24] snapshot_conf: add new argument to virDomainSnapshotAlignDisks
by Peter Krempa 25 Jul '23

25 Jul '23

Preferrably: virDomainSnapshotAlignDisks: Allow overriding user-configured snapshot default Reply-To: In-Reply-To: <322f30a38fa3a4e7a6ef9b1161a07da4b74f0d6e.1687877087.git.phrdina(a)redhat.com> On Tue, Jun 27, 2023 at 17:07:08 +0200, Pavel Hrdina wrote: > This new option will be used by external snapshot revert code. > > Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> > --- > src/conf/snapshot_conf.c | 15 ++++++++++++--- > src/conf/snapshot_conf.h | 3 ++- > src/qemu/qemu_snapshot.c | 2 +- > src/test/test_driver.c | 2 +- > 4 files changed, 16 insertions(+), 6 deletions(-) Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>

1 1

[libvirt PATCH 0/5] Simplify x86 cpu feature synchronization with qemu
by Tim Wiederhake 25 Jul '23

25 Jul '23

A recurring task in libvirt is synchronizing the list of (x86) cpu features with qemu. This is an error-prone and manual task as it relies on parsing qemu c source code and therefore neccessarily lags behind qemu development. The better solution would be if qemu and libvirt both got the cpu feature information from a common source. libcpuinfo [1] wants to be that source, a comprehensive, architecture agnostic database of cpu information, together with some handy tooling, e.g. a library to access this database at run-time, quering the host for capabilities, calculate baselines for different sets of capabilities. libcpuinfo comes with c headers and contains python bindings. This patch series prepares libvirt's x86 feature list to be automatically generated from libcpuinfo data, but introduces no dependency on libcpuinfo yet. Introducing that dependency to generate the feature list on compile time or making use of libcpuinfo's more advanced features would be up to discussion at a later date. Note that libcpuinfo's feature database is not on par with libvirt yet and to generate an identical version of x86_features.xml the data from libcpuinfo's "wip" branch is required. [1] https://gitlab.com/twiederh/libcpuinfo Tim Wiederhake (5): cpu_map: Sort cpu features cpu_map: Format register values uniformly cpu_map: Format comments cpu_map: Remove unused alias information cpu_map: Generate x86 feature map from libcpuinfo src/cpu_map/x86_features.py | 119 +++++++ src/cpu_map/x86_features.xml | 594 +++++++++++++++++------------------ 2 files changed, 407 insertions(+), 306 deletions(-) create mode 100755 src/cpu_map/x86_features.py -- 2.39.2

2 6

[PATCH] qemu_domain: Partially validate memory amounts when auto-adding NUMA node
by Michal Privoznik 25 Jul '23

25 Jul '23

When automatically adding a NUMA node (qemuDomainDefNumaAutoAdd()) the memory size of the node is computed as: total_memory - sum(memory devices) And we have a nice helper for that: virDomainDefGetMemoryInitial() so it looks logical to just call it. Except, this code runs in post parse callback, i.e. memory sizes were not validated and it may happen that the sum is greater than the total memory. This would be caught by virDomainDefPostParseMemory() but that runs only after driver specific callbacks (i.e. after qemuDomainDefNumaAutoAdd()) and because the domain config was changed and memory was increased to this huge number no error is caught. So let's do what virDomainDefGetMemoryInitial() would do, but with error checking. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2216236 Fixes: f5d4f5c8ee44e9f1939070afcc5381bdd5545e50 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6eea8a9fa5..fdda001795 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4821,17 +4821,24 @@ qemuDomainDefNumaAutoAdd(virDomainDef *def, return 0; } - initialMem = virDomainDefGetMemoryInitial(def); + initialMem = virDomainDefGetMemoryTotal(def); if (!def->numa) def->numa = virDomainNumaNew(); virDomainNumaSetNodeCount(def->numa, 1); - virDomainNumaSetNodeMemorySize(def->numa, 0, initialMem); for (i = 0; i < def->nmems; i++) { virDomainMemoryDef *mem = def->mems[i]; + if (mem->size > initialMem) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Total size of memory devices exceeds the total memory size")); + return -1; + } + + initialMem -= mem->size; + switch (mem->model) { case VIR_DOMAIN_MEMORY_MODEL_DIMM: case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: @@ -4848,6 +4855,8 @@ qemuDomainDefNumaAutoAdd(virDomainDef *def, } } + virDomainNumaSetNodeMemorySize(def->numa, 0, initialMem); + return 0; } -- 2.41.0

2 1

[PATCH] util: file: Mark 'BeeGFS' as shared filesystem
by Peter Krempa 25 Jul '23

25 Jul '23

BeeGFS is a shared/distributed filesystem: https://doc.beegfs.io/latest/overview/overview.html Mark it as shared based on it's magic number: https://git.beegfs.io/pub/v7/-/blob/master/client_module/source/filesystem/… Closes: https://gitlab.com/libvirt/libvirt/-/issues/508 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virfile.c | 6 +++++- src/util/virfile.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 7c44a2a963..2984e2ead2 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3382,6 +3382,8 @@ virFileRemoveLastComponent(char *path) # endif # define VIR_ACFS_MAGIC 0x61636673 +/* https://git.beegfs.io/pub/v7/-/blob/master/client_module/source/filesystem/… */ +# define VIR_BEEGFS_MAGIC 0x19830326 /* formerly fhgfs */ # define PROC_MOUNTS "/proc/mounts" @@ -3469,6 +3471,7 @@ static const struct virFileSharedFsData virFileSharedFs[] = { { .fstype = VIR_FILE_SHFS_CEPH, .magic = CEPH_SUPER_MAGIC }, { .fstype = VIR_FILE_SHFS_GPFS, .magic = GPFS_SUPER_MAGIC }, { .fstype = VIR_FILE_SHFS_ACFS, .magic = VIR_ACFS_MAGIC }, + { .fstype = VIR_FILE_SHFS_BEEGFS, .magic = VIR_BEEGFS_MAGIC }, }; @@ -3719,7 +3722,8 @@ int virFileIsSharedFS(const char *path) VIR_FILE_SHFS_GPFS| VIR_FILE_SHFS_QB | VIR_FILE_SHFS_ACFS | - VIR_FILE_SHFS_GLUSTERFS); + VIR_FILE_SHFS_GLUSTERFS | + VIR_FILE_SHFS_BEEGFS); } diff --git a/src/util/virfile.h b/src/util/virfile.h index b75a7cc53b..60bb1d64e7 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -226,6 +226,7 @@ enum { VIR_FILE_SHFS_QB = (1 << 8), /* Quobyte shared filesystem */ VIR_FILE_SHFS_ACFS = (1 << 9), /* Oracle ASM Cluster File System */ VIR_FILE_SHFS_GLUSTERFS = (1 << 10), /* gluster's FUSE-based client */ + VIR_FILE_SHFS_BEEGFS = (1 << 11), /* BeeGFS/fhGFS */ }; int virFileIsSharedFSType(const char *path, unsigned int fstypes) ATTRIBUTE_NONNULL(1); -- 2.41.0

2 1

[PATCH] ci: Switch to OpenSUSE Leap 15.5
by Michal Privoznik 25 Jul '23

25 Jul '23

OpenSUSE Leap was released recently (2023-06-07). Refresh our CI with latest lcitool which brings this minor update. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/944440144 ci/containers/opensuse-leap-15.Dockerfile | 2 +- ci/gitlab/builds.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile index ca11edf808..dfb5b27bbb 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.opensuse.org/opensuse/leap:15.4 +FROM registry.opensuse.org/opensuse/leap:15.5 RUN zypper update -y && \ zypper install -y \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 8910a19c79..f4e67b363e 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -300,7 +300,7 @@ x86_64-opensuse-leap-15-local-env: needs: [] allow_failure: false variables: - IMAGE: registry.opensuse.org/opensuse/leap:15.4 + IMAGE: registry.opensuse.org/opensuse/leap:15.5 NAME: opensuse-leap-15 RPM: skip -- 2.41.0

2 1

[PATCH v2] docs: Mention vhostuser for queues and queue_size
by Han Han 25 Jul '23

25 Jul '23

These two attributes are supported for vhost-user-blk as well. Signed-off-by: Han Han <hhan(a)redhat.com> --- Update the supported version of the queues attribute of vhost-user-blk v1: https://listman.redhat.com/archives/libvir-list/2023-July/240836.html docs/formatdomain.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 4af0b82569..973de8dd4f 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3275,9 +3275,10 @@ paravirtualized driver is specified via the ``disk`` element. "virtio" ``bus`` and "pci" or "ccw" ``address`` types. :since:`Since 1.2.8 (QEMU 2.1)` - The optional ``queues`` attribute specifies the number of virt queues for - virtio-blk. ( :since:`Since 3.9.0` ) + virtio-blk ( :since:`Since 3.9.0` ) or vhost-user-blk + ( :since `Since 7.1.0` ) - The optional ``queue_size`` attribute specifies the size of each virt - queue for virtio-blk. ( :since:`Since 7.8.0` ) + queue for virtio-blk or vhost-user-blk. ( :since:`Since 7.8.0` ) - For virtio disks, `Virtio-related options`_ can also be set. ( :since:`Since 3.5.0` ) - The optional ``metadata_cache`` subelement controls aspects related to the -- 2.41.0

2 1

[PATCH v2] NEWS: qemu: Implement QEMU NBD reconnect delay attribute
by Han Han 25 Jul '23

25 Jul '23

Signed-off-by: Han Han <hhan(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 22fc7e5971..6b202147a6 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -232,6 +232,11 @@ v9.2.0 (2023-04-01) corresponding JSON descriptor has the highest priority, or manually by using ``<loader format='qcow2'/>`` in the domain XML. + * qemu: Implement QEMU NBD reconnect delay attribute + + Support the nbd reconnect-delay of QEMU. It will set the delay time for + reconnect after an unexpected disconnect or a serious error. + * **Improvements** * qemu: Make firmware selection persistent -- 2.41.0

2 1

[libvirt PATCH 0/6] Sync cpu features with qemu
by Tim Wiederhake 24 Jul '23

24 Jul '23

This brings libvirt in sync qith qemu commit 6f05a92ddc73ac8aa16cfd6188f907b30b0501e3. Tim Wiederhake (6): cpu_map: Add missing feature "mcdt-no" cpu_map: Add missing feature "sbdr-ssdp-no" cpu_map: Add missing feature "fbsdp-no" cpu_map: Add missing feature "psdp-no" cpu_map: Add missing feature "pbrsb-no" sync_qemu_models_i386.py: Add missing features src/cpu_map/sync_qemu_models_i386.py | 7 +++++++ src/cpu_map/x86_features.xml | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) -- 2.39.2

2 7

[PATCH 0/2] fix use-after-free in network IO
by Oleg Vasilev 24 Jul '23

24 Jul '23

Found by repeatedly created and destroyed channels with guest agent. More details in the patch. Oleg Vasilev (2): net: add debug logs remote: fix stream use-after-free src/remote/remote_daemon_stream.c | 13 +++++++------ src/rpc/virnetmessage.c | 5 +++++ 2 files changed, 12 insertions(+), 6 deletions(-) -- 2.41.0

2 5

[PATCH v2 0/2] qemu: generate shorter channel target paths
by Michal Privoznik 24 Jul '23

24 Jul '23

v2 of: https://listman.redhat.com/archives/libvir-list/2023-July/240680.html diff to v1: - Squashed some patches together - Updated comment in qemuDomainChrDefDropDefaultPath() - fixed more XMLs Michal Prívozník (2): qemu: Generate shorter channel target paths qemu: Move channelTargetDir into stateDir libvirt.spec.in | 2 - src/qemu/qemu_conf.c | 9 +-- src/qemu/qemu_domain.c | 65 ++++++++++++++++--- .../qemuhotplug-qemu-agent-detach.xml | 2 +- .../qemuhotplug-base+qemu-agent-detach.xml | 2 +- .../qemuhotplug-base+qemu-agent.xml | 2 +- ...emuhotplug-base-live+qemu-agent-detach.xml | 2 +- .../qemuhotplug-base-live+qemu-agent.xml | 2 +- .../channel-unix-source-path.xml | 8 +++ .../channel-unix-source-path-active.xml | 10 +++ .../channel-unix-source-path-inactive.xml | 8 +++ tests/testutilsqemu.c | 2 +- 12 files changed, 90 insertions(+), 24 deletions(-) -- 2.41.0

1 2

[PATCH 0/4] qemu: generate shorter channel target paths
by Michal Privoznik 24 Jul '23

24 Jul '23

*** BLURB HERE *** Michal Prívozník (4): qemu: Generate shorter channel target paths tests: Reflect changed channelTargetDir qemu: Move channelTargetDir into stateDir tests: Reflect changed channelTargetDir libvirt.spec.in | 2 - src/qemu/qemu_conf.c | 9 +-- src/qemu/qemu_domain.c | 59 ++++++++++++++++--- .../qemuhotplug-qemu-agent-detach.xml | 2 +- ...emuhotplug-base-live+qemu-agent-detach.xml | 2 +- .../qemuhotplug-base-live+qemu-agent.xml | 2 +- .../channel-unix-source-path.xml | 8 +++ .../channel-unix-source-path-active.xml | 10 ++++ .../channel-unix-source-path-inactive.xml | 8 +++ tests/testutilsqemu.c | 2 +- 10 files changed, 85 insertions(+), 19 deletions(-) -- 2.41.0

3 7

[libvirt] [PATCH RESEND 0/4] Introduce Notification VM exit feature (kvm x86 only)
by Lin Ma 24 Jul '23

24 Jul '23

Kernel supports Notification VM exit feature since v6.0 under commit 2f4073e0. QEMU supports it as well since v7.2 under commit e2e69f6b. Lin Ma (4): conf: Introduce notify VM exit feature qemu: Validate notify VM exit feature is available only on x86 qemu: Generate command line for notify VM exit feature NEWS: Document notify VM exit feature NEWS.rst | 8 ++++++ docs/formatdomain.rst | 4 +++ src/conf/domain_conf.c | 32 +++++++++++++++++++++ src/conf/domain_conf.h | 7 +++++ src/conf/schemas/domaincommon.rng | 17 +++++++++++ src/qemu/qemu_command.c | 23 +++++++++++++-- src/qemu/qemu_validate.c | 12 +++++++- tests/qemuxml2argvdata/kvm-features-off.xml | 1 + tests/qemuxml2argvdata/kvm-features.args | 2 +- tests/qemuxml2argvdata/kvm-features.xml | 1 + 10 files changed, 102 insertions(+), 5 deletions(-) -- 2.41.0

4 8

[PATCH] docs: Mention vhostuser for queues and queue_size
by Han Han 24 Jul '23

24 Jul '23

These two attributes are supported for vhost-user-blk as well. Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/formatdomain.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 4af0b82569..447ab32c01 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3275,9 +3275,9 @@ paravirtualized driver is specified via the ``disk`` element. "virtio" ``bus`` and "pci" or "ccw" ``address`` types. :since:`Since 1.2.8 (QEMU 2.1)` - The optional ``queues`` attribute specifies the number of virt queues for - virtio-blk. ( :since:`Since 3.9.0` ) + virtio-blk or vhost-user-blk. ( :since:`Since 3.9.0` ) - The optional ``queue_size`` attribute specifies the size of each virt - queue for virtio-blk. ( :since:`Since 7.8.0` ) + queue for virtio-blk or vhost-user-blk. ( :since:`Since 7.8.0` ) - For virtio disks, `Virtio-related options`_ can also be set. ( :since:`Since 3.5.0` ) - The optional ``metadata_cache`` subelement controls aspects related to the -- 2.41.0

2 4

Plans for 9.6.0 release (freeze on Wednesday 26 Jul)
by Jiri Denemark 21 Jul '23

21 Jul '23

We are getting close to 9.6.0 release of libvirt. To aim for the release on Tuesday 01 Aug I suggest entering the freeze on Wednesday 26 Jul and tagging RC2 on Friday 28 Jul. I hope this works for everyone. Jirka

1 0

[PATCH 0/2] qemu_tpm: Try harder to create emulator state
by Michal Privoznik 21 Jul '23

21 Jul '23

*** BLURB HERE *** Michal Prívozník (2): virfile: Introduce virDirIsEmpty() qemu_tpm: Try harder to create emulator state src/libvirt_private.syms | 1 + src/qemu/qemu_tpm.c | 3 ++- src/util/virfile.c | 39 +++++++++++++++++++++++++++++++++++++++ src/util/virfile.h | 3 +++ 4 files changed, 45 insertions(+), 1 deletion(-) -- 2.41.0

2 4

[PATCH 0/2] Improve the validation for queues and queue_size
by Han Han 21 Jul '23

21 Jul '23

Han Han (2): conf/domain_validate.c: Improve the err for queue validation conf/domain_validate: Validate the disk queue_size src/conf/domain_validate.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.41.0

2 3

Plans for the next release
by Jiri Denemark 21 Jul '23

21 Jul '23

We are getting close to the next release of libvirt. To aim for the release on Aug 01 I suggest entering the freeze on Wednesday Jul 26 and tagging RC2 on Friday Jul 28. I hope this works for everyone. Jirka

1 0

[PATCH RFC 0/4] rely on QEMU provided macros for some QEMU feature selection
by Daniel P. Berrangé 20 Jul '23

20 Jul '23

We currently have various features in the RPMs selected based on what the QEMU RPM has built. If the QEMU RPM changes, then libvirt needs to change to match which is an undesirable situation. Forthcoming upstream QEMU changes will involve corresponding Fedora downstream changes. eg removal of i386 host support for system emulators. I would like to make it so that we don't change libvirt RPM spec when these changes happen, merely rebuild libvirt and it "does the right thing". To that end I've proposed some QEMU macros for Fedora: https://src.fedoraproject.org/rpms/qemu/pull-request/43 with intention they would also go into future RHEL-10. This series illustrates what libvirt RPM spec changes would be to adapt to this. I'm not proposing to merge this libvirt series. Rather looking for whether I've missed anything in the design from te QEMU side that could be done better for libvirt. Daniel P. Berrangé (4): rpm: boilerplate to pull in qemu-srpm-macros rpm: use %{qemu_sysemu_host_arches} rpm: use %{qemu_sysemu_kvm_arches} rpm: use %{qemu_sysemu_tcg_non_native} libvirt.spec.in | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) -- 2.41.0

1 4

[PATCH] storage: zfs: Use 'zfs list' to check pool status
by Matt Low 20 Jul '23

20 Jul '23

The current virtStorageBackendZFSCheckPool checks for the existence of a path under /dev/zvol/ to determine if the pool is active. ZFS does not create a path under /dev/zvol/ if no ZFS volumes have been created under a particular dataset, thus, empty ZFS storage pools are deactivated whenever checkPool is called on them (as noted in referenced issue). This commit changes virStorageBackendZFSCheckPool so that the 'zfs list' command is used to explicitly check for the existence a dataset specified by the pool's def->source.name. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/221 Signed-off-by: Matt Low <matt(a)mlow.ca> --- src/storage/storage_backend_zfs.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index 2a5d74357d..4e243a738a 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -85,10 +85,24 @@ virStorageBackendZFSCheckPool(virStoragePoolObj *pool G_GNUC_UNUSED, bool *isActive) { virStoragePoolDef *def = virStoragePoolObjGetDef(pool); - g_autofree char *devpath = NULL; + g_autoptr(virCommand) cmd = NULL; + int exit_code = -1; + + /* Check for an existing dataset of type 'filesystem' by the name of our + * pool->source.name. */ + cmd = virCommandNewArgList(ZFS, + "list", "-H", + "-t", "filesystem", + "-o", "name", + def->source.name, + NULL); + + + if (virCommandRun(cmd, &exit_code) < 0) + return -1; - devpath = g_strdup_printf("/dev/zvol/%s", def->source.name); - *isActive = virFileIsDir(devpath); + /* zfs list exits with 0 if the dataset exists, 1 if it doesn't */ + *isActive = exit_code == 0; return 0; } -- 2.39.2

3 2

[PATCH Libvirt v2 0/3] support discard and write-zeroes options for virtio-blk device
by ~hyman 20 Jul '23

20 Jul '23

v2: This version made some modifications. (include suggestion of Jonathon) - rebase on master - assume QEMU support discard and write-zeroes and drop the capability introduction and probe - add validation for options, only allowing attributes be configured for VIRTIO bus - enrich the test case - update NEWS Thanks Jonathon for pointing out the redundant commit in time. Please review! Yong DISCARD and WRITE_ZEROES commands has been implemented in virtio-blk protocol since qemu >= 4.2.0, may be it's time to introduce discard and write-zeroes options for virtio-blk device in libvirt so that the upper layer can enable this feature at disk granularity. To distinguish the discard option in block drive layer, use the 'virtio' prefix to indicate that these attributes are specific for virtio-blk disk. To try this out, three things has done in this patchset: 1. introduce capabilities of discard and write-zeroes for virtio-blk 2. add virtio_discard and virtio_write_zeroes attributes of driver in disk xml element 3. generate cmd line when launching vm Hyman Huang(黄勇) (3): conf: Add 'virtio_discard' and 'virtio_write_zeroes' attributes qemu_command: Generate cmd line for discard and write-zeroes properties NEWS: Mention support for discard and write_zeroes of virtio-blk device NEWS.rst | 8 +++ docs/formatdomain.rst | 8 +++ src/conf/domain_conf.c | 16 +++++ src/conf/domain_conf.h | 2 + src/conf/schemas/domaincommon.rng | 10 ++++ src/conf/storage_source_conf.c | 2 + src/conf/storage_source_conf.h | 2 + src/qemu/qemu_command.c | 2 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_validate.c | 9 +++ src/vz/vz_utils.c | 12 ++++ .../disk-virtio-discard.x86_64-latest.args | 45 ++++++++++++++ .../qemuxml2argvdata/disk-virtio-discard.xml | 45 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../disk-virtio-discard.x86_64-latest.xml | 58 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 17 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-discard.x86_64-latest.xml -- 2.38.5

3 7

[libvirt PATCH 0/4] Introduce new Metadata fields for Network object with corresponding APIs
by K Shiva Kiran 19 Jul '23

19 Jul '23

This commit introduces <title> and <description> fields to the XML schema of the Network object. It also adds public Get/Set APIs for modifying all metadata fields of the same, along with a test program. K Shiva Kiran (4): Add <title> and <description> for Network Objects Adding Public Get and Set APIs for Network Metadata Add virNetworkObj Get and Set Methods for Metadata Add Test driver and testcase for Network Metadata change APIs docs/formatnetwork.rst | 11 + include/libvirt/libvirt-network.h | 29 +++ include/libvirt/virterror.h | 1 + src/conf/network_conf.c | 21 ++ src/conf/network_conf.h | 2 + src/conf/schemas/basictypes.rng | 15 ++ src/conf/schemas/domaincommon.rng | 15 -- src/conf/schemas/network.rng | 10 + src/conf/virnetworkobj.c | 325 ++++++++++++++++++++++++++++++ src/conf/virnetworkobj.h | 17 ++ src/driver-network.h | 16 ++ src/libvirt-network.c | 167 +++++++++++++++ src/libvirt_public.syms | 6 + src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 36 +++- src/remote_protocol-structs | 19 ++ src/test/test_driver.c | 67 ++++++ src/util/virerror.c | 3 + tests/meson.build | 1 + tests/networkmetadatatest.c | 297 +++++++++++++++++++++++++++ 20 files changed, 1044 insertions(+), 16 deletions(-) create mode 100644 tests/networkmetadatatest.c -- 2.41.0

2 11

[libvirt PATCH v2 3/4] Add virNetworkObj Get and Set Methods for Metadata
by K Shiva Kiran 19 Jul '23

19 Jul '23

- Introduces virNetworkObjGetMetadata() and virNetworkObjSetMetadata(). - These functions implement common behaviour that can be reused by network drivers that use the virNetworkObj struct. - Introduces virNetworkObjUpdateModificationImpact() among other helper functions that resolve the live/persistent state of the network before setting metadata. - Replace redundant flag resolving code with the forementioned function in bridge_driver.c and test_driver.c - Eliminates redundant call of virNetworkObjSetDefTransient() in virNetworkConfigChangeSetup(). Signed-off-by: K Shiva Kiran <shiva_kr(a)riseup.net> --- src/conf/virnetworkobj.c | 329 ++++++++++++++++++++++++++++++++++-- src/conf/virnetworkobj.h | 21 +++ src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 14 +- src/test/test_driver.c | 16 +- 5 files changed, 345 insertions(+), 36 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index b8b86da06f..20ee8eb58a 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -725,7 +725,6 @@ virNetworkObjReplacePersistentDef(virNetworkObj *obj, */ static int virNetworkObjConfigChangeSetup(virNetworkObj *obj, - virNetworkXMLOption *xmlopt, unsigned int flags) { bool isActive; @@ -738,17 +737,10 @@ virNetworkObjConfigChangeSetup(virNetworkObj *obj, return -1; } - if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { - if (!obj->persistent) { + if ((flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) && + !obj->persistent) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot change persistent config of a " - "transient network")); - return -1; - } - /* this should already have been done by the driver, but do it - * anyway just in case. - */ - if (isActive && (virNetworkObjSetDefTransient(obj, false, xmlopt) < 0)) + _("cannot change persistent config of a transient network")); return -1; } @@ -1187,7 +1179,7 @@ virNetworkObjUpdate(virNetworkObj *obj, g_autoptr(virNetworkDef) configdef = NULL; /* normalize config data, and check for common invalid requests. */ - if (virNetworkObjConfigChangeSetup(obj, xmlopt, flags) < 0) + if (virNetworkObjConfigChangeSetup(obj, flags) < 0) return -1; if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) { @@ -1822,3 +1814,316 @@ virNetworkObjLoadAllPorts(virNetworkObj *net, return 0; } + + +/** + * virNetworkObjUpdateModificationImpact: + * + * @obj: network object + * @flags: flags to update the modification impact on + * + * Resolves virNetworkUpdateFlags in @flags so that they correctly + * apply to the actual state of @obj. @flags may be modified after call to this + * function. + * + * Returns 0 on success if @flags point to a valid combination for @obj or -1 on + * error. + */ +int +virNetworkObjUpdateModificationImpact(virNetworkObj *obj, + unsigned int *flags) +{ + bool isActive = virNetworkObjIsActive(obj); + + if ((*flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG)) == + VIR_NETWORK_UPDATE_AFFECT_CURRENT) { + if (isActive) + *flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; + else + *flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; + } + + if (virNetworkObjConfigChangeSetup(obj, *flags) < 0) + return -1; + + return 0; +} + + +/** + * virNetworkObjGetDefs: + * + * @net: network object + * @flags: for virNetworkUpdateFlags + * @liveDef: Set the pointer to the live definition of @net. + * @persDef: Set the pointer to the config definition of @net. + * + * Helper function to resolve @flags and retrieve correct network pointer + * objects. This function should be used only when the network driver + * creates net->newDef once the network has started. + * + * If @liveDef or @persDef are set it implies that @flags request modification + * thereof. + * + * Returns 0 on success and sets @liveDef and @persDef; -1 if @flags are + * inappropriate. + */ +static int +virNetworkObjGetDefs(virNetworkObj *net, + unsigned int flags, + virNetworkDef **liveDef, + virNetworkDef **persDef) +{ + if (liveDef) + *liveDef = NULL; + + if (persDef) + *persDef = NULL; + + if (virNetworkObjUpdateModificationImpact(net, &flags) < 0) + return -1; + + if (virNetworkObjIsActive(net)) { + if (liveDef && (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE)) + *liveDef = net->def; + + if (persDef && (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG)) + *persDef = net->newDef; + } else { + if (persDef) + *persDef = net->def; + } + + return 0; +} + + +/** + * virNetworkObjGetOneDefState: + * + * @net: Network object + * @flags: for virNetworkUpdateFlags + * @live: set to true if live config was returned (may be omitted) + * + * Helper function to resolve @flags and return the correct network pointer + * object. This function returns one of @net->def or @net->persistentDef + * according to @flags. @live is set to true if the live net config will be + * returned. This helper should be used only in APIs that guarantee + * that @flags contains exactly one of VIR_NETWORK_UPDATE_AFFECT_LIVE or + * VIR_NETWORK_UPDATE_AFFECT_CONFIG and not both. + * + * Returns the correct definition pointer or NULL on error. + */ +static virNetworkDef * +virNetworkObjGetOneDefState(virNetworkObj *net, + unsigned int flags, + bool *live) +{ + if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE && + flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { + virReportInvalidArg(flags, "%s", + _("Flags 'VIR_NETWORK_UPDATE_AFFECT_LIVE' and 'VIR_NETWORK_UPDATE_AFFECT_CONFIG' are mutually exclusive")); + return NULL; + } + + if (virNetworkObjUpdateModificationImpact(net, &flags) < 0) + return NULL; + + if (live) + *live = flags & VIR_NETWORK_UPDATE_AFFECT_LIVE; + + if (virNetworkObjIsActive(net) && flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) + return net->newDef; + + return net->def; +} + + +/** + * virNetworkObjGetOneDef: + * + * @net: Network object + * @flags: for virNetworkUpdateFlags + * + * Helper function to resolve @flags and return the correct network pointer + * object. This function returns one of @net->def or @net->persistentDef + * according to @flags. This helper should be used only in APIs that guarantee + * that @flags contains exactly one of VIR_NETWORK_UPDATE_AFFECT_LIVE or + * VIR_NETWORK_UPDATE_AFFECT_CONFIG and not both. + * + * Returns the correct definition pointer or NULL on error. + */ +static virNetworkDef * +virNetworkObjGetOneDef(virNetworkObj *net, + unsigned int flags) +{ + return virNetworkObjGetOneDefState(net, flags, NULL); +} + + +char * +virNetworkObjGetMetadata(virNetworkObj *net, + int type, + const char *uri, + unsigned int flags) +{ + virNetworkDef *def; + char *ret = NULL; + + virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE | + VIR_NETWORK_UPDATE_AFFECT_CONFIG, NULL); + + if (type >= VIR_NETWORK_METADATA_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown metadata type '%1$d'"), type); + return NULL; + } + + if (!(def = virNetworkObjGetOneDef(net, flags))) + return NULL; + + switch ((virNetworkMetadataType) type) { + case VIR_NETWORK_METADATA_DESCRIPTION: + ret = g_strdup(def->description); + break; + + case VIR_NETWORK_METADATA_TITLE: + ret = g_strdup(def->title); + break; + + case VIR_NETWORK_METADATA_ELEMENT: + if (!def->metadata) + break; + + if (virXMLExtractNamespaceXML(def->metadata, uri, &ret) < 0) + return NULL; + break; + + case VIR_NETWORK_METADATA_LAST: + break; + } + + if (!ret) + virReportError(VIR_ERR_NO_NETWORK_METADATA, "%s", + _("Requested metadata element is not present")); + + return ret; +} + + +static int +virNetworkDefSetMetadata(virNetworkDef *def, + int type, + const char *metadata, + const char *key, + const char *uri) +{ + g_autoptr(xmlDoc) doc = NULL; + xmlNodePtr old; + g_autoptr(xmlNode) new = NULL; + + if (type >= VIR_NETWORK_METADATA_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown metadata type '%1$d'"), type); + return -1; + } + + switch ((virNetworkMetadataType) type) { + case VIR_NETWORK_METADATA_DESCRIPTION: + g_clear_pointer(&def->description, g_free); + + if (STRNEQ_NULLABLE(metadata, "")) + def->description = g_strdup(metadata); + break; + + case VIR_NETWORK_METADATA_TITLE: + g_clear_pointer(&def->title, g_free); + + if (STRNEQ_NULLABLE(metadata, "")) + def->title = g_strdup(metadata); + break; + + case VIR_NETWORK_METADATA_ELEMENT: + if (metadata) { + + /* parse and modify the xml from the user */ + if (!(doc = virXMLParseStringCtxt(metadata, _("(metadata_xml)"), NULL))) + return -1; + + if (virXMLInjectNamespace(doc->children, uri, key) < 0) + return -1; + + /* create the root node if needed */ + if (!def->metadata) + def->metadata = virXMLNewNode(NULL, "metadata"); + + if (!(new = xmlCopyNode(doc->children, 1))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to copy XML node")); + return -1; + } + } + + /* remove possible other nodes sharing the namespace */ + while ((old = virXMLFindChildNodeByNs(def->metadata, uri))) { + xmlUnlinkNode(old); + xmlFreeNode(old); + } + + if (new) { + if (!(xmlAddChild(def->metadata, new))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to add metadata to XML document")); + return -1; + } + new = NULL; + } + break; + + case VIR_NETWORK_METADATA_LAST: + break; + } + + return 0; +} + + +int +virNetworkObjSetMetadata(virNetworkObj *net, + int type, + const char *metadata, + const char *key, + const char *uri, + virNetworkXMLOption *xmlopt, + const char *stateDir, + const char *configDir, + unsigned int flags) +{ + virNetworkDef *def; + virNetworkDef *persistentDef; + + virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE | + VIR_NETWORK_UPDATE_AFFECT_CONFIG, -1); + + if (virNetworkObjGetDefs(net, flags, &def, &persistentDef) < 0) + return -1; + + if (def) { + if (virNetworkDefSetMetadata(def, type, metadata, key, uri) < 0) + return -1; + + if (virNetworkObjSaveStatus(stateDir, net, xmlopt) < 0) + return -1; + } + + if (persistentDef) { + if (virNetworkDefSetMetadata(persistentDef, type, metadata, key, + uri) < 0) + return -1; + + if (virNetworkSaveConfig(configDir, persistentDef, xmlopt) < 0) + return -1; + } + + return 0; +} diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index 7d34fa3204..d3847d3422 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -258,3 +258,24 @@ virNetworkObjListNumOfNetworks(virNetworkObjList *nets, void virNetworkObjListPrune(virNetworkObjList *nets, unsigned int flags); + +int +virNetworkObjUpdateModificationImpact(virNetworkObj *obj, + unsigned int *flags); + +char * +virNetworkObjGetMetadata(virNetworkObj *network, + int type, + const char *uri, + unsigned int flags); + +int +virNetworkObjSetMetadata(virNetworkObj *network, + int type, + const char *metadata, + const char *key, + const char *uri, + virNetworkXMLOption *xmlopt, + const char *stateDir, + const char *configDir, + unsigned int flags); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fb7ad9c855..c392bfd65a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1326,6 +1326,7 @@ virNetworkObjUnrefMacMap; virNetworkObjUnsetDefTransient; virNetworkObjUpdate; virNetworkObjUpdateAssignDef; +virNetworkObjUpdateModificationImpact; # conf/virnetworkportdef.h diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 9eb543a0a3..e776d86c73 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3210,18 +3210,10 @@ networkUpdate(virNetworkPtr net, } } - /* VIR_NETWORK_UPDATE_AFFECT_CURRENT means "change LIVE if network - * is active, else change CONFIG - */ + if (virNetworkObjUpdateModificationImpact(obj, &flags) < 0) + goto cleanup; + isActive = virNetworkObjIsActive(obj); - if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE | - VIR_NETWORK_UPDATE_AFFECT_CONFIG)) == - VIR_NETWORK_UPDATE_AFFECT_CURRENT) { - if (isActive) - flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; - else - flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; - } if (isActive && (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE)) { /* Take care of anything that must be done before updating the diff --git a/src/test/test_driver.c b/src/test/test_driver.c index e7fce053b4..4c1df77f8b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5658,7 +5658,7 @@ testNetworkUpdate(virNetworkPtr net, { testDriver *privconn = net->conn->privateData; virNetworkObj *obj = NULL; - int isActive, ret = -1; + int ret = -1; virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG, @@ -5667,18 +5667,8 @@ testNetworkUpdate(virNetworkPtr net, if (!(obj = testNetworkObjFindByUUID(privconn, net->uuid))) goto cleanup; - /* VIR_NETWORK_UPDATE_AFFECT_CURRENT means "change LIVE if network - * is active, else change CONFIG - */ - isActive = virNetworkObjIsActive(obj); - if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE - | VIR_NETWORK_UPDATE_AFFECT_CONFIG)) == - VIR_NETWORK_UPDATE_AFFECT_CURRENT) { - if (isActive) - flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; - else - flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; - } + if (virNetworkObjUpdateModificationImpact(obj, &flags) < 0) + goto cleanup; /* update the network config in memory/on disk */ if (virNetworkObjUpdate(obj, command, section, -- 2.41.0

1 1

[PATCH] node_device: Don't leak error message buffer from virMdevctlListDefined|Active
by Peter Krempa 19 Jul '23

19 Jul '23

nodeDeviceUpdateMediatedDevices invokes virMdevctlListDefined and virMdevctlListActive both of which were passed the same 'errmsg' buffer. Since virCommandSetErrorBuffer() always allocates the error buffer one of them was leaked. Fix it by populating the 'errmsg' buffer only on failure of virMdevctlListActive|Defined which invoke the command. Add a comment to nodeDeviceGetMdevctlListCommand reminding how virCommandSetErrorBuffer() works. Fixes: 44a0f2f0c8f Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/node_device/node_device_driver.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index a2d0600560..f8fae71194 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1044,6 +1044,15 @@ virMdevctlSetAutostart(virNodeDeviceDef *def, bool autostart, char **errmsg) } +/** + * nodeDeviceGetMdevctlListCommand: + * @defined: list mdevctl entries with persistent config + * @output: filled with the output of mdevctl once invoked + * @errmsg: always allocated, optionally filled with error from 'mdevctl' + * + * Prepares a virCommand structure to invoke 'mdevctl' caller is responsible to + * free the buffers which are filled by the virCommand infrastructure. + */ virCommand* nodeDeviceGetMdevctlListCommand(bool defined, char **output, @@ -1623,9 +1632,11 @@ virMdevctlListDefined(virNodeDeviceDef ***devs, char **errmsg) { int status; g_autofree char *output = NULL; - g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(true, &output, errmsg); + g_autofree char *errbuf = NULL; + g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(true, &output, &errbuf); if (virCommandRun(cmd, &status) < 0 || status != 0) { + *errmsg = g_steal_pointer(&errbuf); return -1; } @@ -1641,9 +1652,11 @@ virMdevctlListActive(virNodeDeviceDef ***devs, char **errmsg) { int status; g_autofree char *output = NULL; - g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(false, &output, errmsg); + g_autofree char *errbuf = NULL; + g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(false, &output, &errbuf); if (virCommandRun(cmd, &status) < 0 || status != 0) { + *errmsg = g_steal_pointer(&errbuf); return -1; } -- 2.41.0

2 1

[PATCH] qemu: Adapt to new way of specifying PC speaker
by Michal Privoznik 19 Jul '23

19 Jul '23

Historically, the way to set PC speaker for a guest was to pass: -soundhw pcspk but as of QEMU commit v5.1.0-rc0~28^2~3 this is deprecated and we should use: -machine pcspk-audiodev=$id instead. The old way was then removed in commit v7.1.0-rc0~99^2~3. Now, ideally we would have a capability selecting whether we talk to a QEMU that understands the new way or not. But it's not that simple - the machine attribute is just an alias to the .audiodev= attribute of 'isa-pcspk' object and both are created in pc_machine_initfn() function, i.e. not then the PC_MACHINE() class is initialized, but when it's instantiated. IOW, it's not possible for us to query whether we're dealing with older or newer QEMU. But given that the newer version is supported since v5.1.0 and the minimal version we require is v4.2.0 (i.e. there are two releases which don't understand the newer cmd line) and how frequently this feature is (un-)used (the issue was reported after ~1 year since it stopped working), I believe we can live without any capability and just use the newer cmd line unconditionally. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/490 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 57 ++++++++++++------- .../sound-device.x86_64-4.2.0.args | 3 +- .../sound-device.x86_64-latest.args | 3 +- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a19902988c..3b0b162b8b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4477,31 +4477,30 @@ qemuBuildSoundCommandLine(virCommand *cmd, for (i = 0; i < def->nsounds; i++) { virDomainSoundDef *sound = def->sounds[i]; - /* Sadly pcspk device doesn't use -device syntax. Fortunately - * we don't need to set any PCI address on it, so we don't - * mind too much */ - if (sound->model == VIR_DOMAIN_SOUND_MODEL_PCSPK) { - virCommandAddArgList(cmd, "-soundhw", "pcspk", NULL); - } else { - if (qemuCommandAddExtDevice(cmd, &sound->info, def, qemuCaps) < 0) - return -1; + /* Sadly pcspk device doesn't use -device syntax. And it + * was handled already in qemuBuildMachineCommandLine(). + */ + if (sound->model == VIR_DOMAIN_SOUND_MODEL_PCSPK) + continue; - if (qemuBuildSoundDevCmd(cmd, def, sound, qemuCaps) < 0) - return -1; + if (qemuCommandAddExtDevice(cmd, &sound->info, def, qemuCaps) < 0) + return -1; - if (virDomainSoundModelSupportsCodecs(sound)) { - for (j = 0; j < sound->ncodecs; j++) { - if (qemuBuildSoundCodecCmd(cmd, def, sound, sound->codecs[j], - qemuCaps) < 0) - return -1; - } + if (qemuBuildSoundDevCmd(cmd, def, sound, qemuCaps) < 0) + return -1; - if (j == 0) { - virDomainSoundCodecDef codec = { VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX, 0 }; + if (virDomainSoundModelSupportsCodecs(sound)) { + for (j = 0; j < sound->ncodecs; j++) { + if (qemuBuildSoundCodecCmd(cmd, def, sound, sound->codecs[j], + qemuCaps) < 0) + return -1; + } - if (qemuBuildSoundCodecCmd(cmd, def, sound, &codec, qemuCaps) < 0) - return -1; - } + if (j == 0) { + virDomainSoundCodecDef codec = { VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX, 0 }; + + if (qemuBuildSoundCodecCmd(cmd, def, sound, &codec, qemuCaps) < 0) + return -1; } } } @@ -7029,6 +7028,22 @@ qemuBuildMachineCommandLine(virCommand *cmd, } } + /* PC speaker is a bit different than the rest of sound cards + * which is handled in qemuBuildSoundCommandLine(). */ + for (i = 0; i < def->nsounds; i++) { + const virDomainSoundDef *sound = def->sounds[i]; + g_autofree char *audioid = NULL; + + if (sound->model != VIR_DOMAIN_SOUND_MODEL_PCSPK) + continue; + + if (!(audioid = qemuGetAudioIDString(def, sound->audioId))) + return -1; + + virBufferAsprintf(&buf, ",pcspk-audiodev=%s", audioid); + break; + } + qemuBuildMachineACPI(&buf, def, qemuCaps); virCommandAddArgBuffer(cmd, &buf); diff --git a/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args b/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args index b2a5afd8c8..1e3cc9eaa2 100644 --- a/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.2,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off,pcspk-audiodev=audio1 \ -accel tcg \ -cpu qemu64 \ -m 214 \ @@ -28,7 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --soundhw pcspk \ -device ES1370,id=sound1,audiodev=audio1,bus=pci.0,addr=0x2 \ -device sb16,id=sound2,audiodev=audio1 \ -device AC97,id=sound3,audiodev=audio1,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/sound-device.x86_64-latest.args b/tests/qemuxml2argvdata/sound-device.x86_64-latest.args index e0a2f21b31..7c90c1271c 100644 --- a/tests/qemuxml2argvdata/sound-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/sound-device.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pcspk-audiodev=audio1,acpi=off \ -accel tcg \ -cpu qemu64 \ -m 214 \ @@ -28,7 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --soundhw pcspk \ -device '{"driver":"ES1370","id":"sound1","audiodev":"audio1","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"sb16","id":"sound2","audiodev":"audio1"}' \ -device '{"driver":"AC97","id":"sound3","audiodev":"audio1","bus":"pci.0","addr":"0x3"}' \ -- 2.39.3

3 2

[PATCH 0/2] Improve running test suite under valgrind
by Michal Privoznik 19 Jul '23

19 Jul '23

*** BLURB HERE *** Michal Prívozník (2): meson: Annotate each test() with 'suite' tests: Refresh valgrind suppressions docs/advanced-tests.rst | 2 +- docs/html/meson.build | 1 + docs/meson.build | 1 + src/access/meson.build | 1 + src/meson.build | 10 +++ tests/.valgrind.supp | 188 +++++++++------------------------------- tests/meson.build | 11 ++- 7 files changed, 64 insertions(+), 150 deletions(-) -- 2.41.0

3 6

[PATCH] qemu: Retire QEMU_CAPS_USB_STORAGE_REMOVABLE
by Michal Privoznik 19 Jul '23

19 Jul '23

Introduced in QEMU commit of v0.14.0-rc0~83^2~1 and not being able to compile the .removable attribute of the "usb-storage" object out, renders our corresponding capability QEMU_CAPS_USB_STORAGE_REMOVABLE useless. Retire it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_capabilities.c | 9 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 10 +- src/qemu/qemu_validate.c | 8 - .../caps_4.2.0_aarch64.replies | 195 ++++---------- .../caps_4.2.0_aarch64.xml | 1 - .../caps_4.2.0_ppc64.replies | 179 +++--------- .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1 - .../caps_4.2.0_x86_64.replies | 211 +++++---------- .../caps_4.2.0_x86_64.xml | 1 - .../caps_5.0.0_aarch64.replies | 211 ++++----------- .../caps_5.0.0_aarch64.xml | 1 - .../caps_5.0.0_ppc64.replies | 203 ++++---------- .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1 - .../caps_5.0.0_riscv64.replies | 191 +++---------- .../caps_5.0.0_riscv64.xml | 1 - .../caps_5.0.0_x86_64.replies | 227 +++++----------- .../caps_5.0.0_x86_64.xml | 1 - .../caps_5.1.0_x86_64.replies | 231 +++++----------- .../caps_5.1.0_x86_64.xml | 1 - .../caps_5.2.0_aarch64.replies | 219 ++++----------- .../caps_5.2.0_aarch64.xml | 1 - .../caps_5.2.0_ppc64.replies | 207 ++++---------- .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 - .../caps_5.2.0_riscv64.replies | 195 +++----------- .../caps_5.2.0_riscv64.xml | 1 - .../caps_5.2.0_x86_64.replies | 235 +++++----------- .../caps_5.2.0_x86_64.xml | 1 - .../caps_6.0.0_aarch64.replies | 217 ++++----------- .../caps_6.0.0_aarch64.xml | 1 - .../caps_6.0.0_x86_64.replies | 233 +++++----------- .../caps_6.0.0_x86_64.xml | 1 - .../caps_6.1.0_x86_64.replies | 239 +++++----------- .../caps_6.1.0_x86_64.xml | 1 - .../caps_6.2.0_aarch64.replies | 223 ++++----------- .../caps_6.2.0_aarch64.xml | 1 - .../caps_6.2.0_ppc64.replies | 211 ++++----------- .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - .../caps_6.2.0_x86_64.replies | 243 +++++------------ .../caps_6.2.0_x86_64.xml | 1 - .../caps_7.0.0_aarch64+hvf.replies | 227 ++++------------ .../caps_7.0.0_aarch64+hvf.xml | 1 - .../caps_7.0.0_aarch64.replies | 227 ++++------------ .../caps_7.0.0_aarch64.xml | 1 - .../caps_7.0.0_ppc64.replies | 211 ++++----------- .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - .../caps_7.0.0_x86_64.replies | 243 +++++------------ .../caps_7.0.0_x86_64.xml | 1 - .../caps_7.1.0_ppc64.replies | 211 ++++----------- .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - .../caps_7.1.0_x86_64.replies | 243 +++++------------ .../caps_7.1.0_x86_64.xml | 1 - .../caps_7.2.0_ppc.replies | 211 +++------------ tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - .../caps_7.2.0_x86_64+hvf.replies | 255 +++++------------- .../caps_7.2.0_x86_64+hvf.xml | 1 - .../caps_7.2.0_x86_64.replies | 255 +++++------------- .../caps_7.2.0_x86_64.xml | 1 - .../caps_8.0.0_riscv64.replies | 207 +++----------- .../caps_8.0.0_riscv64.xml | 1 - .../caps_8.0.0_x86_64.replies | 255 +++++------------- .../caps_8.0.0_x86_64.xml | 1 - .../caps_8.1.0_x86_64.replies | 255 +++++------------- .../caps_8.1.0_x86_64.xml | 1 - 64 files changed, 1704 insertions(+), 5025 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7dad7231ee..26adb38844 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -280,7 +280,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "i440fx-pci-hole64-size", /* X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE */ "q35-pci-hole64-size", /* X_QEMU_CAPS_Q35_PCI_HOLE64_SIZE */ "usb-storage", /* QEMU_CAPS_DEVICE_USB_STORAGE */ - "usb-storage.removable", /* QEMU_CAPS_USB_STORAGE_REMOVABLE */ + "usb-storage.removable", /* X_QEMU_CAPS_USB_STORAGE_REMOVABLE */ /* 155 */ "virtio-mmio", /* QEMU_CAPS_DEVICE_VIRTIO_MMIO */ @@ -1467,10 +1467,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[] = { { "filter", QEMU_CAPS_USB_REDIR_FILTER, NULL }, }; -static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = { - { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL }, -}; - static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsKVMPit[] = { { "lost_tick_policy", QEMU_CAPS_KVM_PIT_TICK_POLICY, NULL }, }; @@ -1618,9 +1614,6 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = { { "usb-redir", virQEMUCapsDevicePropsUSBRedir, G_N_ELEMENTS(virQEMUCapsDevicePropsUSBRedir), QEMU_CAPS_USB_REDIR }, - { "usb-storage", virQEMUCapsDevicePropsUSBStorage, - G_N_ELEMENTS(virQEMUCapsDevicePropsUSBStorage), - QEMU_CAPS_DEVICE_USB_STORAGE }, { "kvm-pit", virQEMUCapsDevicePropsKVMPit, G_N_ELEMENTS(virQEMUCapsDevicePropsKVMPit), -1 }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ce545cb2cc..a90988405b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -258,7 +258,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */ X_QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */ QEMU_CAPS_DEVICE_USB_STORAGE, /* -device usb-storage */ - QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */ + X_QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */ /* 155 */ QEMU_CAPS_DEVICE_VIRTIO_MMIO, /* -device virtio-mmio */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cde6ab4dde..550cb0aebf 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1840,12 +1840,10 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, case VIR_DOMAIN_DISK_BUS_USB: driver = "usb-storage"; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_REMOVABLE)) { - if (disk->removable == VIR_TRISTATE_SWITCH_ABSENT) - removable = VIR_TRISTATE_SWITCH_OFF; - else - removable = disk->removable; - } + if (disk->removable == VIR_TRISTATE_SWITCH_ABSENT) + removable = VIR_TRISTATE_SWITCH_OFF; + else + removable = disk->removable; break; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index a53729d349..e1939322ea 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2997,14 +2997,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, return -1; } - if (disk->removable != VIR_TRISTATE_SWITCH_ABSENT && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_REMOVABLE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("This QEMU doesn't support setting the " - "removable flag of USB storage devices")); - return -1; - } - break; case VIR_DOMAIN_DISK_BUS_XEN: diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies index f8619d8843..896ff981d2 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies @@ -17727,107 +17727,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "serial", - "type": "str" - }, - { - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "share-rw", - "type": "bool" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "attached", - "type": "bool" - }, - { - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -17839,7 +17748,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17925,7 +17834,7 @@ "type": "str" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17933,7 +17842,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17984,7 +17893,7 @@ "type": "str" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17992,7 +17901,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18166,7 +18075,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18174,7 +18083,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18235,7 +18144,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18243,11 +18152,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -18259,7 +18168,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18433,7 +18342,7 @@ "type": "str" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18441,11 +18350,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -18457,7 +18366,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18523,7 +18432,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18531,7 +18440,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -18633,7 +18542,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -18641,7 +18550,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18730,7 +18639,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18738,7 +18647,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18809,7 +18718,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18817,7 +18726,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18882,7 +18791,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18890,7 +18799,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18954,7 +18863,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18962,7 +18871,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19149,12 +19058,12 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19712,7 +19621,7 @@ "deprecated": false } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19720,7 +19629,7 @@ "arguments": { "typename": "virt-4.2-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19873,7 +19782,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19881,7 +19790,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19986,12 +19895,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20182,34 +20091,34 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21377,12 +21286,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21460,12 +21369,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-gic-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -21481,7 +21390,7 @@ "kernel": false } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -21492,7 +21401,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -21522,7 +21431,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -21537,7 +21446,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -21567,7 +21476,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml index 6a7f33e3c6..0c5e917658 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml @@ -37,7 +37,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies index e31c49f24d..cbaa9a02a1 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies @@ -17156,107 +17156,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "serial", - "type": "str" - }, - { - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "share-rw", - "type": "bool" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "attached", - "type": "bool" - }, - { - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -17268,7 +17177,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17350,7 +17259,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17358,7 +17267,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17405,7 +17314,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17413,7 +17322,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17578,7 +17487,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17586,7 +17495,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17642,7 +17551,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17650,11 +17559,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -17666,7 +17575,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17831,7 +17740,7 @@ "type": "str" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17839,11 +17748,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17855,7 +17764,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17916,7 +17825,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17924,7 +17833,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17990,7 +17899,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17998,7 +17907,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18100,7 +18009,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18108,7 +18017,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18197,7 +18106,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18205,7 +18114,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18270,7 +18179,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18278,7 +18187,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18342,12 +18251,12 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18609,7 +18518,7 @@ "deprecated": false } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18617,7 +18526,7 @@ "arguments": { "typename": "pseries-4.2-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18816,7 +18725,7 @@ "type": "string" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18824,7 +18733,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18929,12 +18838,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21130,34 +21039,34 @@ "static": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -22296,12 +22205,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -22379,7 +22288,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml index 2064f07c9c..c7b35dd1d6 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml @@ -38,7 +38,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies index a45fd2f669..cf33d049af 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies @@ -17071,103 +17071,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "share-rw", - "type": "bool" - }, - { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "attached", - "type": "bool" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17181,7 +17090,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17189,7 +17098,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17275,7 +17184,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17283,7 +17192,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17334,7 +17243,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17342,7 +17251,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17445,7 +17354,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17453,7 +17362,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17637,7 +17546,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17645,7 +17554,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17716,7 +17625,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17724,7 +17633,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17824,7 +17733,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17832,7 +17741,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18006,7 +17915,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18014,11 +17923,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -18030,7 +17939,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18096,7 +18005,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18104,7 +18013,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18152,7 +18061,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18160,7 +18069,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18207,7 +18116,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18215,7 +18124,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18249,7 +18158,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18257,7 +18166,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18359,7 +18268,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18367,7 +18276,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18456,7 +18365,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18464,7 +18373,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18535,7 +18444,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18543,7 +18452,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18608,7 +18517,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18616,7 +18525,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18680,7 +18589,7 @@ "type": "int" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18688,7 +18597,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20242,12 +20151,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20639,7 +20548,7 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20647,7 +20556,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -20752,12 +20661,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -22140,12 +22049,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -22153,12 +22062,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -22166,12 +22075,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -23457,12 +23366,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -23540,16 +23449,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-sev-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { - "id": "libvirt-45", + "id": "libvirt-44", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -23564,7 +23473,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -23866,7 +23775,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -23880,7 +23789,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -24182,7 +24091,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -24197,7 +24106,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -24499,7 +24408,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml index b45d4a6293..c2f9dd8add 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -47,7 +47,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies index e63c9d5f0a..b5a087f449 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies @@ -18881,119 +18881,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "uint32" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -19005,7 +18902,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19100,7 +18997,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19108,7 +19005,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19161,7 +19058,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19169,7 +19066,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19375,7 +19272,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19383,7 +19280,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19461,7 +19358,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19469,11 +19366,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -19485,7 +19382,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19688,7 +19585,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19696,11 +19593,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19712,7 +19609,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19793,7 +19690,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19801,7 +19698,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19922,7 +19819,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19930,7 +19827,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20024,7 +19921,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20032,7 +19929,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20108,7 +20005,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20116,7 +20013,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20127,7 +20024,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20135,7 +20032,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20205,7 +20102,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20213,7 +20110,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20282,7 +20179,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20290,7 +20187,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20494,12 +20391,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21087,7 +20984,7 @@ "deprecated": false } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21095,7 +20992,7 @@ "arguments": { "typename": "virt-5.0-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21243,7 +21140,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21251,7 +21148,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21341,12 +21238,12 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21542,24 +21439,24 @@ "static": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21567,12 +21464,12 @@ "passthrough", "emulator" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -22730,12 +22627,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -22813,12 +22710,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -22834,7 +22731,7 @@ "kernel": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -22845,7 +22742,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -22876,7 +22773,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -22891,7 +22788,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -22922,7 +22819,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml index a2b7214b8a..8e26b07d23 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml @@ -39,7 +39,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies index aaf69cab46..f449a21b0b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies @@ -18680,119 +18680,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "uint32" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -18804,7 +18701,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18899,7 +18796,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18907,7 +18804,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18960,7 +18857,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18968,7 +18865,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19174,7 +19071,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19182,7 +19079,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19260,7 +19157,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19268,11 +19165,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -19284,7 +19181,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19487,7 +19384,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19495,11 +19392,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19511,7 +19408,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19592,7 +19489,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19600,7 +19497,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19681,7 +19578,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19689,7 +19586,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19731,7 +19628,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19739,7 +19636,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19860,7 +19757,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19868,7 +19765,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19962,7 +19859,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19970,7 +19867,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20046,7 +19943,7 @@ "type": "uint16" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20054,7 +19951,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20065,7 +19962,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20073,7 +19970,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20143,7 +20040,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20151,7 +20048,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20220,12 +20117,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20495,7 +20392,7 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20503,7 +20400,7 @@ "arguments": { "typename": "pseries-5.0-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20712,7 +20609,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20720,7 +20617,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20810,12 +20707,12 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23021,24 +22918,24 @@ "static": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "tpm-spapr" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23046,12 +22943,12 @@ "passthrough", "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -24188,12 +24085,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -24271,7 +24168,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml index 16333ba499..03a47bf713 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml @@ -39,7 +39,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies index 929b2179ae..10e075c9a6 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies @@ -16992,119 +16992,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "uint16" - }, - { - "default-value": false, - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "uint32" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -17116,7 +17013,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17211,7 +17108,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17219,7 +17116,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17272,7 +17169,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17280,7 +17177,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17498,7 +17395,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17506,7 +17403,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17596,7 +17493,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17604,11 +17501,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -17620,7 +17517,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17823,7 +17720,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17831,11 +17728,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17847,7 +17744,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17928,7 +17825,7 @@ "type": "guest statistics" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17936,7 +17833,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18057,7 +17954,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18065,7 +17962,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18159,7 +18056,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18167,7 +18064,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18243,7 +18140,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18251,7 +18148,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18262,7 +18159,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18270,7 +18167,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18340,7 +18237,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18348,7 +18245,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18417,12 +18314,12 @@ "type": "int" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18480,7 +18377,7 @@ "deprecated": false } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18488,7 +18385,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18578,7 +18475,7 @@ "type": "string" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18586,7 +18483,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18676,34 +18573,34 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -19969,12 +19866,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -20052,5 +19949,5 @@ "capability": "validate-uuid" } ], - "id": "libvirt-40" + "id": "libvirt-39" } diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml index 09a71875ef..a9f81c0180 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml @@ -41,7 +41,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies index 13b9b02e4c..6b026771dc 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies @@ -18169,115 +18169,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "uint16" - }, - { - "default-value": false, - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "uint32" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18293,7 +18190,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18301,7 +18198,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18396,7 +18293,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18404,7 +18301,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18457,7 +18354,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18465,7 +18362,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18583,7 +18480,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18591,7 +18488,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18809,7 +18706,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18817,7 +18714,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18907,7 +18804,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18915,7 +18812,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19017,7 +18914,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19025,7 +18922,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19228,7 +19125,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19236,11 +19133,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19252,7 +19149,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19333,7 +19230,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19341,7 +19238,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19399,7 +19296,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19407,7 +19304,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19460,7 +19357,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19468,7 +19365,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19510,7 +19407,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19518,7 +19415,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19639,7 +19536,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19647,7 +19544,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19741,7 +19638,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19749,7 +19646,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19825,7 +19722,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19833,7 +19730,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19844,7 +19741,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19852,7 +19749,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -19922,7 +19819,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -19930,7 +19827,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -19999,7 +19896,7 @@ "type": "int" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20007,7 +19904,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21573,12 +21470,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21954,7 +21851,7 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21962,7 +21859,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -22052,12 +21949,12 @@ "type": "string" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -23602,12 +23499,12 @@ "migration-safe": true } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -23615,12 +23512,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -23628,12 +23525,12 @@ "passthrough", "emulator" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -24909,12 +24806,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -24992,16 +24889,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { - "id": "libvirt-46", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -25016,7 +24913,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -25319,7 +25216,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -25333,7 +25230,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -25636,7 +25533,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -25651,7 +25548,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -25954,7 +25851,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml index 5331cf0113..c84821dd4b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -47,7 +47,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies index d66583fa92..2c815c713f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies @@ -18678,115 +18678,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "removable", - "description": "on/off", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18802,7 +18699,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18810,7 +18707,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18905,7 +18802,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18913,7 +18810,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18966,7 +18863,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18974,7 +18871,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19092,7 +18989,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19100,7 +18997,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19318,7 +19215,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19326,7 +19223,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19416,7 +19313,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19424,7 +19321,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19526,7 +19423,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19534,7 +19431,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19749,7 +19646,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19757,11 +19654,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19773,7 +19670,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19866,7 +19763,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19874,7 +19771,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19932,7 +19829,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19940,7 +19837,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19993,7 +19890,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20001,7 +19898,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20043,7 +19940,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20051,7 +19948,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20172,7 +20069,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20180,7 +20077,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20278,7 +20175,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20286,7 +20183,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20362,7 +20259,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20370,7 +20267,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20565,7 +20462,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20573,7 +20470,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20584,7 +20481,7 @@ "type": "str" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20592,7 +20489,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20662,7 +20559,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20670,7 +20567,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20739,7 +20636,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20747,7 +20644,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -22333,12 +22230,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -22730,7 +22627,7 @@ "deprecated": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -22738,7 +22635,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -22828,12 +22725,12 @@ "type": "string" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -24535,12 +24432,12 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -24548,12 +24445,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -24561,12 +24458,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -25861,12 +25758,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -25944,16 +25841,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -25968,7 +25865,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -26276,7 +26173,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -26290,7 +26187,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -26598,7 +26495,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -26613,7 +26510,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -26921,7 +26818,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml index 1c3d3ea2a9..c8ee593131 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -47,7 +47,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies index 8c78533719..60e0887a9e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies @@ -20044,123 +20044,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -20172,7 +20065,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -20267,7 +20160,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -20275,7 +20168,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -20328,7 +20221,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -20336,7 +20229,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -20547,7 +20440,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -20555,7 +20448,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -20638,7 +20531,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -20646,11 +20539,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -20662,7 +20555,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20882,7 +20775,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20890,11 +20783,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -20906,7 +20799,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -21004,7 +20897,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -21012,7 +20905,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -21054,7 +20947,7 @@ "type": "uint64" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -21062,7 +20955,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -21183,7 +21076,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -21191,7 +21084,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -21289,7 +21182,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -21297,7 +21190,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21373,7 +21266,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21381,7 +21274,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21392,7 +21285,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21400,7 +21293,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21470,7 +21363,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21478,7 +21371,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21547,7 +21440,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21555,7 +21448,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21764,12 +21657,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22506,7 +22399,7 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22514,7 +22407,7 @@ "arguments": { "typename": "virt-5.2-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22677,7 +22570,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22685,7 +22578,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -22770,12 +22663,12 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23009,24 +22902,24 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "tpm-tis" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23034,12 +22927,12 @@ "passthrough", "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -24216,12 +24109,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -24299,12 +24192,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-gic-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -24320,7 +24213,7 @@ "kernel": false } ], - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -24331,7 +24224,7 @@ "name": "host" } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -24363,7 +24256,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -24378,7 +24271,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -24410,7 +24303,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml index b1c5c21abb..131f31b597 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml @@ -39,7 +39,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies index 9a0e5622d9..f012a8c93a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies @@ -19691,123 +19691,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -19819,7 +19712,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19914,7 +19807,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19922,7 +19815,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19975,7 +19868,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19983,7 +19876,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -20194,7 +20087,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -20202,7 +20095,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -20285,7 +20178,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -20293,11 +20186,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -20309,7 +20202,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20529,7 +20422,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20537,11 +20430,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -20553,7 +20446,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20651,7 +20544,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20659,7 +20552,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20750,7 +20643,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20758,7 +20651,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20800,7 +20693,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20808,7 +20701,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20929,7 +20822,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20937,7 +20830,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21035,7 +20928,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21043,7 +20936,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21119,7 +21012,7 @@ "type": "uint16" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21127,7 +21020,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21138,7 +21031,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21146,7 +21039,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21216,7 +21109,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21224,7 +21117,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21293,12 +21186,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21618,7 +21511,7 @@ "default-ram-id": "mpc8544ds.ram" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21626,7 +21519,7 @@ "arguments": { "typename": "pseries-5.2-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21830,7 +21723,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21838,7 +21731,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21923,12 +21816,12 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -24574,24 +24467,24 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "tpm-spapr" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -24599,12 +24492,12 @@ "passthrough", "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -25760,12 +25653,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -25843,7 +25736,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml index 9db85dafef..c719334258 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml @@ -39,7 +39,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies index 19fa83490c..afc22224c0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies @@ -17988,123 +17988,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -18116,7 +18009,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18211,7 +18104,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18219,7 +18112,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18272,7 +18165,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18280,7 +18173,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18503,7 +18396,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18511,7 +18404,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18606,7 +18499,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18614,11 +18507,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -18630,7 +18523,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -18850,7 +18743,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -18858,11 +18751,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -18874,7 +18767,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -18972,7 +18865,7 @@ "type": "guest statistics" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -18980,7 +18873,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19101,7 +18994,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19109,7 +19002,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19207,7 +19100,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19215,7 +19108,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19291,7 +19184,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19299,7 +19192,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19310,7 +19203,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19318,7 +19211,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19388,7 +19281,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19396,7 +19289,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19465,12 +19358,12 @@ "type": "int" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19524,7 +19417,7 @@ "deprecated": false } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19532,7 +19425,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19622,7 +19515,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19630,7 +19523,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -19715,34 +19608,34 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21027,12 +20920,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21110,5 +21003,5 @@ "capability": "validate-uuid" } ], - "id": "libvirt-40" + "id": "libvirt-39" } diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml index 4d03004fa1..fecbf3ef69 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml @@ -41,7 +41,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies index f224bd2fee..68e59b073e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies @@ -19225,119 +19225,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19353,7 +19246,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19361,7 +19254,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19456,7 +19349,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19464,7 +19357,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19517,7 +19410,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19525,7 +19418,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19643,7 +19536,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19651,7 +19544,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19874,7 +19767,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19882,7 +19775,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19977,7 +19870,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19985,7 +19878,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -20103,7 +19996,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -20111,7 +20004,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20331,7 +20224,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20339,11 +20232,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -20355,7 +20248,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20453,7 +20346,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20461,7 +20354,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20519,7 +20412,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20527,7 +20420,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20580,7 +20473,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20588,7 +20481,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20630,7 +20523,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20638,7 +20531,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20759,7 +20652,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20767,7 +20660,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20865,7 +20758,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20873,7 +20766,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20949,7 +20842,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20957,7 +20850,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21157,7 +21050,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21165,7 +21058,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21176,7 +21069,7 @@ "type": "str" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21184,7 +21077,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21254,7 +21147,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21262,7 +21155,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21331,7 +21224,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21339,7 +21232,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -22937,12 +22830,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23400,7 +23293,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23408,7 +23301,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -23493,12 +23386,12 @@ "type": "string" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -25323,12 +25216,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -25336,12 +25229,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -25349,12 +25242,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -26649,12 +26542,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -26732,16 +26625,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -26756,7 +26649,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -27065,7 +26958,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -27079,7 +26972,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -27388,7 +27281,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -27403,7 +27296,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -27712,7 +27605,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml index 654fec58fe..86123439c4 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -47,7 +47,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies index ed04553f29..b7ed0ce448 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies @@ -21824,121 +21824,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -21950,7 +21845,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -22055,7 +21950,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -22063,7 +21958,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -22126,7 +22021,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -22134,7 +22029,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -22367,7 +22262,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -22375,7 +22270,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -22458,7 +22353,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -22466,11 +22361,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -22482,7 +22377,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -22719,7 +22614,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -22727,11 +22622,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -22743,7 +22638,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22841,7 +22736,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22849,7 +22744,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -22891,7 +22786,7 @@ "type": "uint64" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -22899,7 +22794,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -23030,7 +22925,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -23038,7 +22933,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -23134,7 +23029,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -23142,7 +23037,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -23222,7 +23117,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -23230,7 +23125,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -23241,7 +23136,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -23249,7 +23144,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -23319,7 +23214,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -23327,7 +23222,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -23396,7 +23291,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -23404,7 +23299,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -23613,12 +23508,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -24397,7 +24292,7 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -24405,7 +24300,7 @@ "arguments": { "typename": "virt-6.0-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -24591,7 +24486,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -24599,7 +24494,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -24697,12 +24592,12 @@ "type": "child<container>" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -24942,24 +24837,24 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "tpm-tis" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -24967,12 +24862,12 @@ "passthrough", "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -26169,12 +26064,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -26256,12 +26151,12 @@ "capability": "background-snapshot" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-gic-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -26277,7 +26172,7 @@ "kernel": false } ], - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -26288,7 +26183,7 @@ "name": "host" } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -26320,7 +26215,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -26335,7 +26230,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -26367,7 +26262,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml index 6faf407a97..ca69f1b45e 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml @@ -38,7 +38,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies index d815a91f4c..aac31cca53 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies @@ -20873,117 +20873,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -20999,7 +20894,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -21007,7 +20902,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -21112,7 +21007,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -21120,7 +21015,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21183,7 +21078,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21191,7 +21086,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21319,7 +21214,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21327,7 +21222,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21572,7 +21467,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21580,7 +21475,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21675,7 +21570,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21683,7 +21578,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -21816,7 +21711,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -21824,7 +21719,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22061,7 +21956,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22069,11 +21964,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -22085,7 +21980,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -22183,7 +22078,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -22191,7 +22086,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22249,7 +22144,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22257,7 +22152,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -22320,7 +22215,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -22328,7 +22223,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22370,7 +22265,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22378,7 +22273,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22509,7 +22404,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22517,7 +22412,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22613,7 +22508,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22621,7 +22516,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22701,7 +22596,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22709,7 +22604,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22931,7 +22826,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22939,7 +22834,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22950,7 +22845,7 @@ "type": "str" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22958,7 +22853,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -23032,7 +22927,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -23040,7 +22935,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23109,7 +23004,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23117,7 +23012,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -24763,12 +24658,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -25215,7 +25110,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -25223,7 +25118,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -25321,12 +25216,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -27194,12 +27089,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -27207,12 +27102,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -27220,12 +27115,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -28544,12 +28439,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -28631,12 +28526,12 @@ "capability": "background-snapshot" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -28646,7 +28541,7 @@ "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA", "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA" }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -28657,7 +28552,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -28978,7 +28873,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -28992,7 +28887,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -29313,7 +29208,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -29328,7 +29223,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -29649,7 +29544,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml index b1bf3caecf..53876effa8 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies index e55adfbe66..dd8042dafb 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies @@ -21097,123 +21097,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -21229,7 +21118,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -21237,7 +21126,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -21347,7 +21236,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -21355,7 +21244,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21418,7 +21307,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21426,7 +21315,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21554,7 +21443,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21562,7 +21451,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21801,7 +21690,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21809,7 +21698,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21898,7 +21787,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21906,7 +21795,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -22043,7 +21932,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -22051,7 +21940,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22288,7 +22177,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -22296,11 +22185,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -22312,7 +22201,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -22410,7 +22299,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -22418,7 +22307,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22476,7 +22365,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22484,7 +22373,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -22547,7 +22436,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -22555,7 +22444,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22597,7 +22486,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22605,7 +22494,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22741,7 +22630,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22749,7 +22638,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22845,7 +22734,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22853,7 +22742,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22933,7 +22822,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22941,7 +22830,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -23163,7 +23052,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -23171,7 +23060,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -23182,7 +23071,7 @@ "type": "str" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -23190,7 +23079,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -23269,7 +23158,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -23277,7 +23166,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23351,7 +23240,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23359,7 +23248,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -25017,12 +24906,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -25487,7 +25376,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -25495,7 +25384,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -25598,12 +25487,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -27660,12 +27549,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -27673,12 +27562,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -27686,12 +27575,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -29023,12 +28912,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -29110,16 +28999,16 @@ "capability": "background-snapshot" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Failed to open /dev/sev: No such file or directory" @@ -29134,7 +29023,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -29457,7 +29346,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -29471,7 +29360,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -29794,7 +29683,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -29809,7 +29698,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -30132,7 +30021,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml index 13d909e382..667e60b087 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies index 20d176e4b7..0baab2ad15 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies @@ -22637,127 +22637,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -22769,7 +22658,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -22879,7 +22768,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -22887,7 +22776,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -22950,7 +22839,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -22958,7 +22847,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -23197,7 +23086,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -23205,7 +23094,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -23294,7 +23183,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -23302,11 +23191,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -23318,7 +23207,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -23555,7 +23444,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -23563,11 +23452,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -23579,7 +23468,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -23677,7 +23566,7 @@ "type": "int" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -23685,7 +23574,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -23727,7 +23616,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -23735,7 +23624,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -23871,7 +23760,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -23879,7 +23768,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -23975,7 +23864,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -23983,7 +23872,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -24063,7 +23952,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -24071,7 +23960,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -24082,7 +23971,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -24090,7 +23979,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -24165,7 +24054,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -24173,7 +24062,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -24247,7 +24136,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -24255,7 +24144,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -24464,12 +24353,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -25313,7 +25202,7 @@ "deprecated": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -25321,7 +25210,7 @@ "arguments": { "typename": "virt-6.2-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -25517,7 +25406,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -25525,7 +25414,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -25628,12 +25517,12 @@ "type": "child<container>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -25879,24 +25768,24 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -25904,12 +25793,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -27257,12 +27146,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -27344,12 +27233,12 @@ "capability": "background-snapshot" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-gic-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -27365,7 +27254,7 @@ "kernel": false } ], - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -27376,7 +27265,7 @@ "name": "host" } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -27408,7 +27297,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -27423,7 +27312,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -27455,7 +27344,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml index e312801b89..16d8a21081 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml @@ -43,7 +43,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies index 0ac9b2cfe2..e58fab36f6 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies @@ -24557,127 +24557,16 @@ "id": "libvirt-16" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -24689,7 +24578,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24799,7 +24688,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24807,7 +24696,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24870,7 +24759,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24878,7 +24767,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25117,7 +25006,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25125,7 +25014,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25214,7 +25103,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25222,11 +25111,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -25238,7 +25127,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25475,7 +25364,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25483,11 +25372,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -25499,7 +25388,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25597,7 +25486,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25605,7 +25494,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -25701,7 +25590,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -25709,7 +25598,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25751,7 +25640,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25759,7 +25648,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25895,7 +25784,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25903,11 +25792,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -25919,7 +25808,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -25999,7 +25888,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26007,7 +25896,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26018,7 +25907,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26026,7 +25915,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26101,7 +25990,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26109,7 +25998,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26183,12 +26072,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26551,7 +26440,7 @@ "default-ram-id": "mpc8544ds.ram" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26559,7 +26448,7 @@ "arguments": { "typename": "pseries-6.2-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26791,7 +26680,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26799,7 +26688,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -26902,12 +26791,12 @@ "type": "child<container>" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -29559,24 +29448,24 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "tpm-spapr" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -29584,12 +29473,12 @@ "passthrough", "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -30723,12 +30612,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -30810,7 +30699,7 @@ "capability": "background-snapshot" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index e6b0bc03f4..f25eacd8fb 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -39,7 +39,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies index d7da5068b0..d725cba4ed 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies @@ -24274,123 +24274,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24406,7 +24295,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24414,7 +24303,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24524,7 +24413,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24532,7 +24421,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -24595,7 +24484,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -24603,7 +24492,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -24731,7 +24620,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -24739,7 +24628,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -24978,7 +24867,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -24986,7 +24875,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25075,7 +24964,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25083,7 +24972,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25224,7 +25113,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25232,7 +25121,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25469,7 +25358,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25477,11 +25366,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -25493,7 +25382,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25591,7 +25480,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25599,7 +25488,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25657,7 +25546,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25665,7 +25554,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -25728,7 +25617,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -25736,7 +25625,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -25778,7 +25667,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -25786,7 +25675,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -25922,7 +25811,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -25930,7 +25819,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26026,7 +25915,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26034,7 +25923,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26114,7 +26003,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26122,7 +26011,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26344,7 +26233,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26352,7 +26241,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26363,7 +26252,7 @@ "type": "str" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26371,7 +26260,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -26450,7 +26339,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -26458,7 +26347,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -26532,7 +26421,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -26540,7 +26429,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -28280,12 +28169,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -28768,7 +28657,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -28776,7 +28665,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -28879,12 +28768,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -30953,12 +30842,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -30966,12 +30855,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -30979,12 +30868,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -32316,12 +32205,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -32403,16 +32292,16 @@ "capability": "background-snapshot" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -32421,11 +32310,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -32440,7 +32329,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -32773,7 +32662,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -32787,7 +32676,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -33120,7 +33009,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -33135,7 +33024,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -33468,7 +33357,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index e1758396b0..8a3c0192b5 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies index f2854f9fa6..465bdb890b 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies @@ -25915,127 +25915,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -26047,7 +25936,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26157,7 +26046,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26165,7 +26054,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26228,7 +26117,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26236,7 +26125,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26475,7 +26364,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26483,7 +26372,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26572,7 +26461,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26580,11 +26469,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -26596,7 +26485,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26833,7 +26722,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26841,11 +26730,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -26857,7 +26746,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26955,7 +26844,7 @@ "type": "int" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26963,7 +26852,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27005,7 +26894,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27013,7 +26902,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27149,7 +27038,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27157,7 +27046,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27253,7 +27142,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27261,7 +27150,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27341,7 +27230,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27349,7 +27238,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27576,7 +27465,7 @@ "type": "uint64" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27584,7 +27473,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27799,7 +27688,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27807,7 +27696,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27882,7 +27771,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27890,7 +27779,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27964,7 +27853,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27972,7 +27861,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28181,12 +28070,12 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -29056,7 +28945,7 @@ "deprecated": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -29064,7 +28953,7 @@ "arguments": { "typename": "virt-7.0-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -29265,7 +29154,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -29273,7 +29162,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -29376,12 +29265,12 @@ "type": "child<container>" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -29627,24 +29516,24 @@ "deprecated": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -29652,12 +29541,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -31009,12 +30898,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -31096,12 +30985,12 @@ "capability": "background-snapshot" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-gic-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -31117,7 +31006,7 @@ "kernel": false } ], - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -31128,7 +31017,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -31161,7 +31050,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -31176,7 +31065,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -31209,7 +31098,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml index 3517e81d15..13259cce79 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml @@ -42,7 +42,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies index b330e842c2..8ff01e05a4 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies @@ -25915,127 +25915,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -26047,7 +25936,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26157,7 +26046,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26165,7 +26054,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26228,7 +26117,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26236,7 +26125,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26475,7 +26364,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26483,7 +26372,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26572,7 +26461,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26580,11 +26469,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -26596,7 +26485,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26833,7 +26722,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26841,11 +26730,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -26857,7 +26746,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26955,7 +26844,7 @@ "type": "int" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26963,7 +26852,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27005,7 +26894,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27013,7 +26902,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27149,7 +27038,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27157,7 +27046,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27253,7 +27142,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27261,7 +27150,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27341,7 +27230,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27349,7 +27238,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27576,7 +27465,7 @@ "type": "uint64" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27584,7 +27473,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27799,7 +27688,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27807,7 +27696,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27882,7 +27771,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27890,7 +27779,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27964,7 +27853,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27972,7 +27861,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28181,12 +28070,12 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -29056,7 +28945,7 @@ "deprecated": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -29064,7 +28953,7 @@ "arguments": { "typename": "virt-7.0-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -29265,7 +29154,7 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -29273,7 +29162,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -29376,12 +29265,12 @@ "type": "child<container>" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -29627,24 +29516,24 @@ "deprecated": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -29652,12 +29541,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -31009,12 +30898,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -31096,12 +30985,12 @@ "capability": "background-snapshot" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-gic-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -31117,7 +31006,7 @@ "kernel": false } ], - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -31128,7 +31017,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -31161,7 +31050,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -31176,7 +31065,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -31209,7 +31098,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml index 58db75d1d7..1f08d3d696 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml @@ -43,7 +43,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies index 84d993a581..d2e23d84f8 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies @@ -24970,127 +24970,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -25102,7 +24991,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25212,7 +25101,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25220,7 +25109,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25283,7 +25172,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25291,7 +25180,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25530,7 +25419,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25538,7 +25427,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25627,7 +25516,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25635,11 +25524,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -25651,7 +25540,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25888,7 +25777,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25896,11 +25785,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -25912,7 +25801,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26010,7 +25899,7 @@ "type": "guest statistics" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26018,7 +25907,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26114,7 +26003,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26122,7 +26011,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26164,7 +26053,7 @@ "type": "uint64" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26172,7 +26061,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26308,7 +26197,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26316,7 +26205,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26412,7 +26301,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26420,7 +26309,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26500,7 +26389,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26508,7 +26397,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26723,7 +26612,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26731,7 +26620,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26810,7 +26699,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26818,7 +26707,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26892,12 +26781,12 @@ "type": "int" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27269,7 +27158,7 @@ "default-ram-id": "ppc_spapr.ram" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27277,7 +27166,7 @@ "arguments": { "typename": "pseries-7.0-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -27509,7 +27398,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -27517,7 +27406,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -27620,12 +27509,12 @@ "type": "child<container>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -30151,24 +30040,24 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ "tpm-spapr" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -30176,12 +30065,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -31379,12 +31268,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -31466,7 +31355,7 @@ "capability": "background-snapshot" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index 40130f180f..49efb98040 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -45,7 +45,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies index a4b1a8490f..58b589dcfa 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies @@ -24590,123 +24590,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24722,7 +24611,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -24730,7 +24619,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24840,7 +24729,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -24848,7 +24737,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -24911,7 +24800,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -24919,7 +24808,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25047,7 +24936,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25055,7 +24944,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25294,7 +25183,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25302,7 +25191,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25391,7 +25280,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -25399,7 +25288,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25540,7 +25429,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -25548,7 +25437,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25785,7 +25674,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -25793,11 +25682,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -25809,7 +25698,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25907,7 +25796,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -25915,7 +25804,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25978,7 +25867,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -25986,7 +25875,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26049,7 +25938,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26057,7 +25946,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26099,7 +25988,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26107,7 +25996,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26243,7 +26132,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26251,7 +26140,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26347,7 +26236,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26355,7 +26244,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26435,7 +26324,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -26443,7 +26332,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26676,7 +26565,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -26684,7 +26573,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26899,7 +26788,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -26907,7 +26796,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -26986,7 +26875,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -26994,7 +26883,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -27068,7 +26957,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -27076,7 +26965,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -28832,12 +28721,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -29338,7 +29227,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -29346,7 +29235,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -29449,12 +29338,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -31559,12 +31448,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -31572,12 +31461,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -31585,12 +31474,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -32926,12 +32815,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -33013,16 +32902,16 @@ "capability": "background-snapshot" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -33031,7 +32920,7 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -33052,7 +32941,7 @@ } ] }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -33063,7 +32952,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -33400,7 +33289,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -33414,7 +33303,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -33751,7 +33640,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -33766,7 +33655,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -34103,7 +33992,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index b7446435a6..00bf47f46a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies index cf23680766..12ace92630 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies @@ -25678,127 +25678,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -25810,7 +25699,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25920,7 +25809,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25928,7 +25817,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25991,7 +25880,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25999,7 +25888,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26238,7 +26127,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26246,7 +26135,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26335,7 +26224,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26343,11 +26232,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -26359,7 +26248,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26596,7 +26485,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26604,11 +26493,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -26620,7 +26509,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26718,7 +26607,7 @@ "type": "guest statistics" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -26726,7 +26615,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26822,7 +26711,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26830,7 +26719,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26872,7 +26761,7 @@ "type": "uint64" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26880,7 +26769,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27016,7 +26905,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27024,7 +26913,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27120,7 +27009,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27128,7 +27017,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27208,7 +27097,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27216,7 +27105,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27431,7 +27320,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27439,7 +27328,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27518,7 +27407,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27526,7 +27415,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27600,12 +27489,12 @@ "type": "int" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27986,7 +27875,7 @@ "default-ram-id": "ppc_spapr.ram" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27994,7 +27883,7 @@ "arguments": { "typename": "pseries-7.1-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28236,7 +28125,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28244,7 +28133,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28357,12 +28246,12 @@ "type": "child<container>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -30876,24 +30765,24 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ "tpm-spapr" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -30901,12 +30790,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -32104,12 +31993,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -32199,7 +32088,7 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 6bc39b85f7..2306703402 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -44,7 +44,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies index 1726cbc5f3..2248247849 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies @@ -25326,123 +25326,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -25458,7 +25347,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -25466,7 +25355,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25576,7 +25465,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25584,7 +25473,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25647,7 +25536,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25655,7 +25544,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25783,7 +25672,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -25791,7 +25680,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26030,7 +25919,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26038,7 +25927,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -26127,7 +26016,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -26135,7 +26024,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26276,7 +26165,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26284,7 +26173,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -26521,7 +26410,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -26529,11 +26418,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -26545,7 +26434,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26643,7 +26532,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26651,7 +26540,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26719,7 +26608,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26727,7 +26616,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26790,7 +26679,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26798,7 +26687,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26840,7 +26729,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26848,7 +26737,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26984,7 +26873,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26992,7 +26881,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27088,7 +26977,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -27096,7 +26985,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27176,7 +27065,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27184,7 +27073,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27417,7 +27306,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -27425,7 +27314,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27640,7 +27529,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27648,7 +27537,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -27727,7 +27616,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -27735,7 +27624,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -27809,7 +27698,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -27817,7 +27706,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -29610,12 +29499,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -30134,7 +30023,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -30142,7 +30031,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -30255,12 +30144,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -32244,12 +32133,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -32257,12 +32146,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -32270,12 +32159,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -33611,12 +33500,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -33706,16 +33595,16 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -33724,11 +33613,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -33743,7 +33632,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -34081,7 +33970,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -34095,7 +33984,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -34433,7 +34322,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -34448,7 +34337,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -34786,7 +34675,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 6492695705..9edf6a9733 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies index 2df79da5a5..079c9f3d49 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies @@ -26411,139 +26411,16 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -26555,7 +26432,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26665,7 +26542,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26673,7 +26550,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26736,7 +26613,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26744,7 +26621,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26989,7 +26866,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26997,7 +26874,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -27092,7 +26969,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -27100,11 +26977,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -27116,7 +26993,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27359,7 +27236,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27367,11 +27244,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -27383,7 +27260,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -27487,7 +27364,7 @@ "type": "guest statistics" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -27495,7 +27372,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27631,7 +27508,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27639,7 +27516,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27735,7 +27612,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27743,7 +27620,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27829,7 +27706,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27837,7 +27714,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -28058,7 +27935,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -28066,7 +27943,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -28150,7 +28027,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -28158,7 +28035,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -28237,12 +28114,12 @@ "type": "int" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28345,7 +28222,7 @@ "default-ram-id": "mpc8544ds.ram" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28353,7 +28230,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -28466,12 +28343,12 @@ "type": "child<container>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -30781,34 +30658,34 @@ "deprecated": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -32134,12 +32011,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -32229,5 +32106,5 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-40" + "id": "libvirt-39" } diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index f190be552a..e80fd7cc25 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -43,7 +43,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies index 1883926667..d4200b280f 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies @@ -26254,135 +26254,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -26398,7 +26275,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -26406,7 +26283,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26516,7 +26393,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26524,7 +26401,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26587,7 +26464,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26595,7 +26472,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26723,7 +26600,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26731,7 +26608,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26976,7 +26853,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26984,7 +26861,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -27079,7 +26956,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -27087,7 +26964,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27228,7 +27105,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27236,7 +27113,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -27479,7 +27356,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -27487,11 +27364,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -27503,7 +27380,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27607,7 +27484,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27615,7 +27492,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27688,7 +27565,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27696,7 +27573,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27759,7 +27636,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27767,7 +27644,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27809,7 +27686,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27817,7 +27694,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27953,7 +27830,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27961,7 +27838,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -28057,7 +27934,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -28065,7 +27942,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28151,7 +28028,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28159,7 +28036,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -28398,7 +28275,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -28406,7 +28283,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28627,7 +28504,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28635,7 +28512,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28719,7 +28596,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28727,7 +28604,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28806,7 +28683,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28814,7 +28691,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -30607,12 +30484,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -31149,7 +31026,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -31157,7 +31034,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -31270,12 +31147,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -33259,12 +33136,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -33272,12 +33149,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -33285,12 +33162,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -34626,12 +34503,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -34721,16 +34598,16 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -34739,11 +34616,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -34758,7 +34635,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -35096,7 +34973,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -35110,7 +34987,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -35448,7 +35325,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -35463,7 +35340,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -35801,7 +35678,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index c08a99e734..06ba71e1dd 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -45,7 +45,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies index 6a465f6856..875ecd2c2c 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies @@ -26254,135 +26254,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -26398,7 +26275,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -26406,7 +26283,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26516,7 +26393,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -26524,7 +26401,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26587,7 +26464,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -26595,7 +26472,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26723,7 +26600,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -26731,7 +26608,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26976,7 +26853,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -26984,7 +26861,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -27079,7 +26956,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -27087,7 +26964,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27228,7 +27105,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -27236,7 +27113,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -27479,7 +27356,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -27487,11 +27364,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -27503,7 +27380,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27607,7 +27484,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -27615,7 +27492,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27688,7 +27565,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -27696,7 +27573,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27759,7 +27636,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -27767,7 +27644,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27809,7 +27686,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -27817,7 +27694,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27953,7 +27830,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -27961,7 +27838,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -28057,7 +27934,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -28065,7 +27942,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28151,7 +28028,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -28159,7 +28036,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -28398,7 +28275,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -28406,7 +28283,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28627,7 +28504,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -28635,7 +28512,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28719,7 +28596,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28727,7 +28604,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28806,7 +28683,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28814,7 +28691,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -30607,12 +30484,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -31149,7 +31026,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -31157,7 +31034,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -31270,12 +31147,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -33259,12 +33136,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -33272,12 +33149,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -33285,12 +33162,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -34626,12 +34503,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -34721,16 +34598,16 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -34739,11 +34616,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -34758,7 +34635,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -35096,7 +34973,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -35110,7 +34987,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -35448,7 +35325,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -35463,7 +35340,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -35801,7 +35678,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index 37933c0848..e726c5ca97 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies index f6bebee386..7dbbd90427 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies @@ -25045,139 +25045,16 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-17" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -25189,7 +25066,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -25299,7 +25176,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -25307,7 +25184,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25552,7 +25429,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -25560,7 +25437,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25655,7 +25532,7 @@ "type": "size" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -25663,11 +25540,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -25679,7 +25556,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25922,7 +25799,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -25930,11 +25807,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -25946,7 +25823,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26050,7 +25927,7 @@ "type": "guest statistics" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -26058,7 +25935,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -26194,7 +26071,7 @@ "type": "size" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -26202,11 +26079,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -26218,7 +26095,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26304,7 +26181,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -26312,7 +26189,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26533,7 +26410,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -26541,7 +26418,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26625,7 +26502,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -26633,7 +26510,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -26712,12 +26589,12 @@ "type": "int" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26792,7 +26669,7 @@ "default-ram-id": "riscv_virt_board.ram" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -26800,7 +26677,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26933,7 +26810,7 @@ "type": "child<container>" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -26941,7 +26818,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -27054,24 +26931,24 @@ "type": "child<container>" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ "tpm-tis" ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -27079,12 +26956,12 @@ "passthrough", "emulator" ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -28455,12 +28332,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -28550,5 +28427,5 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-38" + "id": "libvirt-37" } diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml index 4c5e72ba56..8286806239 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml @@ -36,7 +36,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies index 94a36dbbc2..c94a80b7b5 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies @@ -27636,135 +27636,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -27780,7 +27657,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -27788,7 +27665,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -27898,7 +27775,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -27906,7 +27783,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -27969,7 +27846,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -27977,7 +27854,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -28105,7 +27982,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -28113,7 +27990,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -28358,7 +28235,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -28366,7 +28243,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -28461,7 +28338,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -28469,7 +28346,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -28615,7 +28492,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -28623,7 +28500,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -28866,7 +28743,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -28874,11 +28751,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -28890,7 +28767,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -28994,7 +28871,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -29002,7 +28879,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -29075,7 +28952,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -29083,7 +28960,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -29146,7 +29023,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -29154,7 +29031,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -29196,7 +29073,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -29204,7 +29081,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -29340,7 +29217,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -29348,7 +29225,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -29444,7 +29321,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -29452,7 +29329,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -29538,7 +29415,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -29546,7 +29423,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -29790,7 +29667,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -29798,7 +29675,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -30019,7 +29896,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -30027,7 +29904,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -30111,7 +29988,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -30119,7 +29996,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -30198,7 +30075,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -30206,7 +30083,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -32023,12 +31900,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -32644,7 +32521,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -32652,7 +32529,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -32765,12 +32642,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -34861,12 +34738,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -34874,12 +34751,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -34887,12 +34764,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -36345,12 +36222,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -36440,16 +36317,16 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -36458,11 +36335,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -36477,7 +36354,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -36820,7 +36697,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -36834,7 +36711,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -37177,7 +37054,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -37192,7 +37069,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -37641,7 +37518,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index cd5341f4fa..e6174532aa 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies index 21ce2566d3..a8afa88c45 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies @@ -27930,135 +27930,12 @@ "id": "libvirt-17" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "usb-storage" - }, - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "pcap", - "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "default-value": true, - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "serial", - "type": "str" - }, - { - "default-value": false, - "name": "commandlog", - "type": "bool" - }, - { - "default-value": "auto", - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "default-value": 0, - "name": "min_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "backend_defaults", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": false, - "name": "removable", - "type": "bool" - }, - { - "default-value": false, - "name": "share-rw", - "type": "bool" - }, - { - "default-value": "auto", - "name": "account-failed", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "logical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "default-value": 0, - "name": "opt_io_size", - "type": "size" - }, - { - "default-value": "auto", - "name": "account-invalid", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" - }, - { - "default-value": 4294967295, - "name": "discard_granularity", - "type": "size" - }, - { - "default-value": 0, - "name": "physical_block_size", - "description": "A power of two between 512 B and 2 MiB", - "type": "size" - }, - { - "default-value": "auto", - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "attached", - "type": "bool" - } - ], - "id": "libvirt-18" -} - { "execute": "device-list-properties", "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -28074,7 +27951,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -28082,7 +27959,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -28198,7 +28075,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -28206,7 +28083,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -28275,7 +28152,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -28283,7 +28160,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -28417,7 +28294,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -28425,7 +28302,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -28676,7 +28553,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -28684,7 +28561,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -28779,7 +28656,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -28787,7 +28664,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -28943,7 +28820,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -28951,7 +28828,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -29200,7 +29077,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -29208,11 +29085,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -29224,7 +29101,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -29328,7 +29205,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -29336,7 +29213,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -29409,7 +29286,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -29417,7 +29294,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -29486,7 +29363,7 @@ "type": "uint16" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -29494,7 +29371,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -29536,7 +29413,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -29544,7 +29421,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -29686,7 +29563,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -29694,7 +29571,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -29790,7 +29667,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -29798,7 +29675,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -29884,7 +29761,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -29892,7 +29769,7 @@ "arguments": { "typename": "virtio-mem-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -30142,7 +30019,7 @@ "type": "child<virtio-mem>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -30150,7 +30027,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -30377,7 +30254,7 @@ "type": "link<PCI>" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -30385,7 +30262,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -30474,7 +30351,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -30482,7 +30359,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -30561,7 +30438,7 @@ "type": "int" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -30569,7 +30446,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -32446,12 +32323,12 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -33087,7 +32964,7 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -33095,7 +32972,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -33208,12 +33085,12 @@ "type": "child<container>" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -35456,12 +35333,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -35469,12 +35346,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -35482,12 +35359,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -36953,12 +36830,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -37048,16 +36925,16 @@ "capability": "postcopy-preempt" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -37066,11 +36943,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -37085,7 +36962,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -37443,7 +37320,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -37457,7 +37334,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -37815,7 +37692,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -37830,7 +37707,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -38294,7 +38171,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index f717c83fec..98a5b2590b 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -46,7 +46,6 @@ <flag name='vfio-pci'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> -- 2.39.3

4 4

[PATCH 0/5] Random fixes
by Michal Privoznik 19 Jul '23

19 Jul '23

The first two patches stem from me playing with split daemons. The rest fixes code in/around virRandomGenerateWWN() since that's where the second patch led me to. Michal Prívozník (5): virsh: Make cmdVersion() work with split daemon virrandom: Accept "nodedev" driver in virRandomGenerateWWN() virrandom: Fix printf format string in virRandomGenerateWWN() test_driver: Pass virt_type to virNodeDeviceDefParse() in testNodeDeviceCreateXML() virrandommock: Drop virRandomGenerateWWN src/test/test_driver.c | 7 +++++-- src/util/virrandom.c | 14 +++++++++++--- tests/virrandommock.c | 8 -------- tools/virsh-host.c | 26 ++++++++++++-------------- 4 files changed, 28 insertions(+), 27 deletions(-) -- 2.41.0

3 11

Re: [PATCH] Added support for vendor and product for qemu ide-hd
by Benedek Major 19 Jul '23

19 Jul '23

Hello, thanks for your fast responses. I've also recognized flaws in my implementation, after your comments, so I'll try to find a solution, that is acceptable, and create a better patch. But first, I'll need to know if this approach is correct: > my interpretation is that the SCSI "product" field data is identical > to the ATAPI "model" field data. > AFAICT, ATAPI doesn't provide a way to expose a vendor in string > format. So I would say we accept 'product' for IDE, but reject > 'vendor' I would also say so. Therefore I would need to expand the vendor field to 40 Chars, if a SATA/IDE bus is selected. (current is 8 for SCSI). about this: > an IDENTIFY DEVICE / IDENTIFY PACKET DEVICE command on some *real* > hardware With hdparm -I /dev/sdX I got: Model Number: TOSHIBA DT01ACA050 Model Number: Samsung SSD 850 EVO 250GB I think hdparam just dumps the raw responses, but correct me if I'm wrong. >> Therefore I would say, that vendor and product pretty much correlate to the model field in QEMU, >>This feels very subjective. Could you please add a better justification? >>E.g. show how qemu formats the default vendor and product name? QEMU formats the defaults as "QEMU HARDDISK" and "QEMU CD-ROM" This was just an assumption, for which I didn't find any spec yet. Since every disk I know is in the form of: MANUFACTURER SOME OTHER MODEL NAME Maybe it is just a convention, but I have no experience in that field. In the Windows VM in device manager under the SATA device for "QEMU HARDDISK" it shows as Device instance path SCSI\DISK&VEN_QEMU&PROD_HARDDISK\, which also made me think that it is the norm. About the coding style, I'll fix those problems. And thanks for reminding me of the memory leaks in C, im so accustomed to writing in code that does not have them, that I almost forgot how aware you must be of declaring pointers. Sincerely, Benedek

3 5

[libvirt PATCH] nodedev: report mdev persistence properly
by Jonathon Jongsma 19 Jul '23

19 Jul '23

Since commit 44a0f2f0, we now query mdevctl for transient (active) mdevs in order to gather attributes for the mdev. Unfortunately, this commit introduced a regression because nodeDeviceUpdateMediatedDevice() assumed that all mdevs returned from mdevctl were actually persistent mdevs but we were using it to update transient mdevs. Refactor the function so that we can use it to update both persistent and transient mdevs. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/node_device/node_device_driver.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index a2d0600560..5dc45ddbb4 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1339,11 +1339,12 @@ nodeDeviceDestroy(virNodeDevicePtr device) /* takes ownership of @def and potentially frees it. @def should not be used * after returning from this function */ static int -nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def) +nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def, + bool defined) { virNodeDeviceObj *obj; virObjectEvent *event; - bool defined = false; + bool was_defined = false; g_autoptr(virNodeDeviceDef) owned = def; g_autofree char *name = g_strdup(owned->name); @@ -1359,13 +1360,13 @@ nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def) bool changed; virNodeDeviceDef *olddef = virNodeDeviceObjGetDef(obj); - defined = virNodeDeviceObjIsPersistent(obj); + was_defined = virNodeDeviceObjIsPersistent(obj); /* Active devices contain some additional information (e.g. sysfs * path) that is not provided by mdevctl, so re-use the existing * definition and copy over new mdev data */ changed = nodeDeviceDefCopyFromMdevctl(olddef, owned); - if (defined && !changed) { + if (was_defined && !changed) { /* if this device was already defined and the definition * hasn't changed, there's nothing to do for this device */ virNodeDeviceObjEndAPI(&obj); @@ -1373,11 +1374,11 @@ nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def) } } - /* all devices returned by virMdevctlListDefined() are persistent */ - virNodeDeviceObjSetPersistent(obj, true); + if (defined) + virNodeDeviceObjSetPersistent(obj, true); virNodeDeviceObjSetAutostart(obj, def->caps->data.mdev.autostart); - if (!defined) + if (!was_defined && defined) event = virNodeDeviceEventLifecycleNew(name, VIR_NODE_DEVICE_EVENT_DEFINED, 0); @@ -1447,7 +1448,7 @@ nodeDeviceDefineXML(virConnect *conn, * have already received the uuid from virMdevctlDefine(), we can simply * add the provisional device to the list and return it immediately and * avoid this long delay. */ - if (nodeDeviceUpdateMediatedDevice(g_steal_pointer(&def)) < 0) + if (nodeDeviceUpdateMediatedDevice(g_steal_pointer(&def), true) < 0) return NULL; return virGetNodeDevice(conn, name); @@ -1742,7 +1743,7 @@ nodeDeviceUpdateMediatedDevices(void) removeMissingPersistentMdev, &data); for (i = 0; i < data.ndefs; i++) - if (nodeDeviceUpdateMediatedDevice(defs[i]) < 0) + if (nodeDeviceUpdateMediatedDevice(defs[i], true) < 0) return -1; /* Update active/transient mdev devices */ @@ -1753,7 +1754,7 @@ nodeDeviceUpdateMediatedDevices(void) } for (i = 0; i < act_ndefs; i++) - if (nodeDeviceUpdateMediatedDevice(act_defs[i]) < 0) + if (nodeDeviceUpdateMediatedDevice(act_defs[i], false) < 0) return -1; return 0; -- 2.41.0

3 2

[PATCH 0/2] NEWS update for 9.4 and 9.6
by Han Han 19 Jul '23

19 Jul '23

Han Han (2): NEWS: qemu: Support removable attribute for scsi disk NEWS: cpu_map: Add SapphireRapids cpu model NEWS.rst | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.41.0

2 4

[libvirt PATCH] qemu: require memfd memory for virtio 'blob' support
by Jonathon Jongsma 19 Jul '23

19 Jul '23

The virtio-gpu 'blob' support was insufficiently validated. Qemu requires a memfd memory backing in order to use udmabuf and enable blob support. Example error: $ virsh start rhel9 error: Failed to start domain 'rhel9' error: internal error: qemu unexpectedly closed the monitor: 2023-07-18T02:33:57.083178Z qemu-kvm: -device {"driver":"virtio-vga","id":"video0","max_outputs":1,"blob":true,"bus":"pcie.0","addr":"0x1"}: cannot enable blob resources without udmabuf Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/qemu/qemu_validate.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 7e09e2c52f..139e6f3d62 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2598,6 +2598,7 @@ qemuValidateDomainDeviceDefHostdev(const virDomainHostdevDef *hostdev, static int qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video, + const virDomainDef *def, virQEMUCaps *qemuCaps) { virDomainCapsDeviceVideo videoCaps = { 0 }; @@ -2714,11 +2715,18 @@ qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video, } if (video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { - if (video->blob != VIR_TRISTATE_SWITCH_ABSENT && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_BLOB)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("this QEMU does not support 'blob' for virtio-gpu devices")); - return -1; + if (video->blob != VIR_TRISTATE_SWITCH_ABSENT) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_BLOB)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("this QEMU does not support 'blob' for virtio-gpu devices")); + return -1; + } + if (video->blob == VIR_TRISTATE_SWITCH_ON + && def->mem.source != VIR_DOMAIN_MEMORY_SOURCE_MEMFD) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'blob' support for virtio-gpu devices requires a memfd memory backend")); + return -1; + } } } @@ -5217,7 +5225,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef *dev, qemuCaps); case VIR_DOMAIN_DEVICE_VIDEO: - return qemuValidateDomainDeviceDefVideo(dev->data.video, qemuCaps); + return qemuValidateDomainDeviceDefVideo(dev->data.video, def, qemuCaps); case VIR_DOMAIN_DEVICE_DISK: return qemuValidateDomainDeviceDefDisk(dev->data.disk, def, qemuCaps); -- 2.41.0

2 1

[PATCH Libvirt 0/3] support discard and write-zeroes options for virtio-blk device
by ~hyman 19 Jul '23

19 Jul '23

DISCARD and WRITE_ZEROES commands has been implemented in virtio-blk protocol since qemu >= 4.2.0, may be it's time to introduce discard and write-zeroes options for virtio-blk device in libvirt so that the upper layer can enable this feature at disk granularity. To distinguish the discard option in block drive layer, use the 'virtio' prefix to indicate that these attributes are specific for virtio-blk disk. To try this out, three things has done in this patchset: 1. introduce capabilities of discard and write-zeroes for virtio-blk 2. add virtio_discard and virtio_write_zeroes attributes of driver in disk xml element 3. generate cmd line when launching vm Please review, any comments and suggestions are very appreciated, thanks! Yong Hyman Huang(黄勇) (3): qemu_capabilities: Introduce virtio-blk DISCARD and WRITE_ZEROES capabilities conf: Add 'virtio_discard' and 'virtio_write_zeroes' attributes qemu_command: Generate cmd line for discard and write-zeroes properties docs/formatdomain.rst | 8 +++ src/conf/domain_conf.c | 16 ++++++ src/conf/domain_conf.h | 2 + src/conf/schemas/domaincommon.rng | 10 ++++ src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 2 + src/qemu/qemu_validate.c | 14 +++++ .../caps_4.2.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 2 + .../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 2 + .../caps_4.2.0_x86_64.xml | 2 + .../caps_5.0.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 2 + .../caps_5.0.0_riscv64.xml | 2 + .../caps_5.0.0_x86_64.xml | 2 + .../caps_5.1.0_x86_64.xml | 2 + .../caps_5.2.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 2 + .../caps_5.2.0_riscv64.xml | 2 + .../qemucapabilitiesdata/caps_5.2.0_s390x.xml | 2 + .../caps_5.2.0_x86_64.xml | 2 + .../caps_6.0.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 2 + .../caps_6.0.0_x86_64.xml | 2 + .../caps_6.1.0_x86_64.xml | 2 + .../caps_6.2.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 + .../caps_6.2.0_x86_64.xml | 2 + .../caps_7.0.0_aarch64+hvf.xml | 2 + .../caps_7.0.0_aarch64.xml | 2 + .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 + .../caps_7.0.0_x86_64.xml | 2 + .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 + .../caps_7.1.0_x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 + .../caps_7.2.0_x86_64+hvf.xml | 2 + .../caps_7.2.0_x86_64.xml | 2 + .../caps_8.0.0_riscv64.xml | 2 + .../caps_8.0.0_x86_64.xml | 2 + .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 2 + .../caps_8.1.0_x86_64.xml | 2 + .../disk-virtio-discard.x86_64-latest.args | 44 +++++++++++++++ .../qemuxml2argvdata/disk-virtio-discard.xml | 56 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 45 files changed, 227 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.xml -- 2.38.5

3 5

[PATCH] qemu: S390 does not provide physical address size
by Boris Fiuczynski 19 Jul '23

19 Jul '23

Commit be1b7d5b18 introduced parsing /proc/cpuinfo for "address size" which is not including on S390 and therefore reports an internal error. Lets remove the parsing on S390. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Reviewed-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> Reviewed-by: Collin Walling <walling(a)linux.ibm.com> --- src/cpu/cpu_x86.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/util/virhostcpu.c | 11 +++++++++-- src/util/virhostcpu.h | 3 ++- tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 - tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 - tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 - tests/domaincapsdata/qemu_8.1.0.s390x.xml | 1 - tests/domaincapsmock.c | 7 +++++-- 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 8d371d5501..3c0163c4d1 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2795,7 +2795,7 @@ virCPUx86GetHost(virCPUDef *cpu, VIR_DEBUG("Host CPU does not support invariant TSC"); } - if (virHostCPUGetPhysAddrSize(&addrsz) == 0) { + if (virHostCPUGetPhysAddrSize(cpuData->arch, &addrsz) == 0) { virCPUMaxPhysAddrDef *addr = g_new0(virCPUMaxPhysAddrDef, 1); addr->bits = addrsz; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c9f4b17208..d82fe88057 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3911,7 +3911,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCaps *qemuCaps, } if (virQEMUCapsTypeIsAccelerated(type)) - virHostCPUGetPhysAddrSize(&physAddrSize); + virHostCPUGetPhysAddrSize(hostArch, &physAddrSize); virQEMUCapsSetHostModel(qemuCaps, type, physAddrSize, cpu, migCPU, fullCPU); diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 19195a1470..41be4bffe0 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1646,10 +1646,16 @@ virHostCPUGetSignature(char **signature) } int -virHostCPUGetPhysAddrSize(unsigned int *size) +virHostCPUGetPhysAddrSize(const virArch hostArch, unsigned int *size) { g_autoptr(FILE) cpuinfo = NULL; + if (ARCH_IS_S390(hostArch)) { + /* Ensure size is set to 0 as physical address size is unknown */ + *size = 0; + return 0; + } + if (!(cpuinfo = fopen(CPUINFO_PATH, "r"))) { virReportSystemError(errno, _("Failed to open cpuinfo file '%1$s'"), CPUINFO_PATH); @@ -1669,7 +1675,8 @@ virHostCPUGetSignature(char **signature) } int -virHostCPUGetPhysAddrSize(unsigned int *size G_GNUC_UNUSED) +virHostCPUGetPhysAddrSize(const virArch hostArch G_GNUC_UNUSED, + unsigned int *size G_GNUC_UNUSED) { errno = ENOSYS; return -1; diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 5232fee36d..5f0d43e069 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -87,7 +87,8 @@ virHostCPUTscInfo *virHostCPUGetTscInfo(void); int virHostCPUGetSignature(char **signature); -int virHostCPUGetPhysAddrSize(unsigned int *size); +int virHostCPUGetPhysAddrSize(const virArch hostArch, + unsigned int *size); int virHostCPUGetHaltPollTime(pid_t pid, unsigned long long *haltPollSuccess, diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml index c35bed1326..81395f43bf 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -38,7 +38,6 @@ </mode> <mode name='host-model' supported='yes'> <model fallback='forbid'>gen15a-base</model> - <maxphysaddr mode='passthrough' limit='64'/> <feature policy='require' name='aen'/> <feature policy='require' name='cmmnt'/> <feature policy='require' name='vxpdeh'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml index 9dbf118713..1e615dab7c 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -38,7 +38,6 @@ </mode> <mode name='host-model' supported='yes'> <model fallback='forbid'>gen15a-base</model> - <maxphysaddr mode='passthrough' limit='64'/> <feature policy='require' name='aen'/> <feature policy='require' name='cmmnt'/> <feature policy='require' name='vxpdeh'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml index f0a8b196f5..f3287347aa 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -38,7 +38,6 @@ </mode> <mode name='host-model' supported='yes'> <model fallback='forbid'>gen15a-base</model> - <maxphysaddr mode='passthrough' limit='64'/> <feature policy='require' name='aen'/> <feature policy='require' name='cmmnt'/> <feature policy='require' name='vxpdeh'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml index 6b78a718b0..7380edd0c4 100644 --- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml @@ -38,7 +38,6 @@ </mode> <mode name='host-model' supported='yes'> <model fallback='forbid'>gen16a-base</model> - <maxphysaddr mode='passthrough' limit='64'/> <feature policy='require' name='nnpa'/> <feature policy='require' name='aen'/> <feature policy='require' name='cmmnt'/> diff --git a/tests/domaincapsmock.c b/tests/domaincapsmock.c index cecb333602..6a23f2cb11 100644 --- a/tests/domaincapsmock.c +++ b/tests/domaincapsmock.c @@ -37,9 +37,12 @@ virHostCPUGetMicrocodeVersion(virArch hostArch G_GNUC_UNUSED) } int -virHostCPUGetPhysAddrSize(unsigned int *size) +virHostCPUGetPhysAddrSize(const virArch hostArch, unsigned int *size) { - *size = 64; + if (ARCH_IS_S390(hostArch)) + *size = 0; + else + *size = 64; return 0; } -- 2.41.0

2 1

[PATCH 0/3] qemu: capabilities: Retire QEMU_CAPS_SCSI_DISK_WWN and QEMU_CAPS_IDE_DRIVE_WWN
by Peter Krempa 18 Jul '23

18 Jul '23

Peter Krempa (3): qemu: Always assume support for QEMU_CAPS_SCSI_DISK_WWN qemu: Always assume support for QEMU_CAPS_IDE_DRIVE_WWN qemu: capabilities: Retire QEMU_CAPS_(IDE|SCSI)_DRIVE_WWN src/qemu/qemu_capabilities.c | 6 ++--- src/qemu/qemu_capabilities.h | 4 +-- src/qemu/qemu_validate.c | 26 ------------------- .../caps_4.2.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 2 -- .../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 - .../caps_4.2.0_x86_64.xml | 2 -- .../caps_5.0.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 2 -- .../caps_5.0.0_riscv64.xml | 2 -- .../caps_5.0.0_x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_5.1.0_sparc.xml | 1 - .../caps_5.1.0_x86_64.xml | 2 -- .../caps_5.2.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 2 -- .../caps_5.2.0_riscv64.xml | 2 -- .../qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 - .../caps_5.2.0_x86_64.xml | 2 -- .../caps_6.0.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - .../caps_6.0.0_x86_64.xml | 2 -- .../caps_6.1.0_x86_64.xml | 2 -- .../caps_6.2.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 -- .../caps_6.2.0_x86_64.xml | 2 -- .../caps_7.0.0_aarch64+hvf.xml | 2 -- .../caps_7.0.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 -- .../caps_7.0.0_x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 -- .../caps_7.1.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 -- .../caps_7.2.0_x86_64+hvf.xml | 2 -- .../caps_7.2.0_x86_64.xml | 2 -- .../caps_8.0.0_riscv64.xml | 2 -- .../caps_8.0.0_x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - .../caps_8.1.0_x86_64.xml | 2 -- tests/qemuxml2xmltest.c | 2 +- 39 files changed, 5 insertions(+), 98 deletions(-) -- 2.41.0

2 4

[PATCH] qemu: capabilities: Update capabilities test data for qemu-8.1 dev cycle
by Peter Krempa 18 Jul '23

18 Jul '23

Update the test data on x86_64 to v8.0.0-2835-g361d539735 Notable changes: - added new commands: - cxl-inject-dram-event - cxl-inject-general-media-event - cxl-inject-memory-module-event - cxl-inject-poison - switchover-ack - q35-8.1 machine type now supports 1024 cpus - new cpu models: - 'SapphireRapids-v2' - 'GraniteRapids-v1' - removed commands: - x-query-profile - cpu features which can be emulated now: - rdseed, rdpid, 3dnowprefetch, xsaveerptr, wbnoinvd - applicable CPU bug mitigation flags are now exposed to TCG guests to allow using more named models Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 2 +- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 5 +- .../caps_8.1.0_x86_64.replies | 3856 +++++++++-------- .../caps_8.1.0_x86_64.xml | 580 +-- 4 files changed, 2453 insertions(+), 1990 deletions(-) diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml index f8165fe212..0c6ed0f858 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -3,7 +3,7 @@ <domain>kvm</domain> <machine>pc-q35-8.1</machine> <arch>x86_64</arch> - <vcpu max='288'/> + <vcpu max='1024'/> <iothreads supported='yes'/> <os supported='yes'> <enum name='firmware'> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index ea9e085af5..0089331fcf 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -50,6 +50,7 @@ <feature policy='require' name='pku'/> <feature policy='require' name='vaes'/> <feature policy='require' name='la57'/> + <feature policy='require' name='rdpid'/> <feature policy='require' name='pks'/> <feature policy='require' name='fsrm'/> <feature policy='require' name='fzrm'/> @@ -57,16 +58,16 @@ <feature policy='require' name='fsrc'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='xsaveerptr'/> + <feature policy='require' name='wbnoinvd'/> <feature policy='require' name='npt'/> <feature policy='require' name='vgif'/> <feature policy='require' name='svme-addr-chk'/> <feature policy='disable' name='vme'/> - <feature policy='disable' name='rdseed'/> <feature policy='disable' name='sha-ni'/> <feature policy='disable' name='xsavec'/> <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> <feature policy='disable' name='osvw'/> <feature policy='disable' name='topoext'/> <feature policy='disable' name='nrip-save'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies index 21ce2566d3..3d603c04b0 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies @@ -21,7 +21,7 @@ "minor": 0, "major": 8 }, - "package": "v8.0.0-1739-g5f9dd6a8ce" + "package": "v8.0.0-2835-g361d539735" }, "id": "libvirt-2" } @@ -1379,15 +1379,6 @@ "unstable" ] }, - { - "name": "x-query-profile", - "ret-type": "210", - "meta-type": "command", - "arg-type": "0", - "features": [ - "unstable" - ] - }, { "name": "x-query-ramblock", "ret-type": "210", @@ -1721,17 +1712,41 @@ "arg-type": "0" }, { - "name": "cxl-inject-uncorrectable-errors", + "name": "cxl-inject-general-media-event", "ret-type": "0", "meta-type": "command", "arg-type": "268" }, { - "name": "cxl-inject-correctable-error", + "name": "cxl-inject-dram-event", "ret-type": "0", "meta-type": "command", "arg-type": "269" }, + { + "name": "cxl-inject-memory-module-event", + "ret-type": "0", + "meta-type": "command", + "arg-type": "270" + }, + { + "name": "cxl-inject-poison", + "ret-type": "0", + "meta-type": "command", + "arg-type": "271" + }, + { + "name": "cxl-inject-uncorrectable-errors", + "ret-type": "0", + "meta-type": "command", + "arg-type": "272" + }, + { + "name": "cxl-inject-correctable-error", + "ret-type": "0", + "meta-type": "command", + "arg-type": "273" + }, { "name": "0", "members": [ @@ -1754,7 +1769,7 @@ }, { "name": "status", - "type": "270" + "type": "274" } ], "meta-type": "object" @@ -1768,7 +1783,7 @@ }, { "name": "reason", - "type": "271" + "type": "275" } ], "meta-type": "object" @@ -1782,7 +1797,7 @@ }, { "name": "reason", - "type": "271" + "type": "275" } ], "meta-type": "object" @@ -1792,7 +1807,7 @@ "members": [ { "name": "action", - "type": "272" + "type": "276" } ], "meta-type": "object" @@ -1802,7 +1817,7 @@ "members": [ { "name": "action", - "type": "272" + "type": "276" } ], "meta-type": "object" @@ -1813,22 +1828,22 @@ { "name": "reboot", "default": null, - "type": "273" + "type": "277" }, { "name": "shutdown", "default": null, - "type": "274" + "type": "278" }, { "name": "panic", "default": null, - "type": "275" + "type": "279" }, { "name": "watchdog", "default": null, - "type": "272" + "type": "276" } ], "meta-type": "object" @@ -1838,12 +1853,12 @@ "members": [ { "name": "action", - "type": "276" + "type": "280" }, { "name": "info", "default": null, - "type": "277" + "type": "281" } ], "meta-type": "object" @@ -1853,12 +1868,12 @@ "members": [ { "name": "action", - "type": "276" + "type": "280" }, { "name": "info", "default": null, - "type": "277" + "type": "281" } ], "meta-type": "object" @@ -1868,15 +1883,15 @@ "members": [ { "name": "recipient", - "type": "278" + "type": "282" }, { "name": "action", - "type": "279" + "type": "283" }, { "name": "flags", - "type": "280" + "type": "284" } ], "meta-type": "object" @@ -1890,7 +1905,7 @@ }, { "name": "status", - "type": "281" + "type": "285" } ], "meta-type": "object" @@ -1969,11 +1984,11 @@ }, { "name": "type", - "type": "282" + "type": "286" }, { "name": "status", - "type": "281" + "type": "285" }, { "name": "current-progress", @@ -2134,7 +2149,7 @@ { "name": "read-only-mode", "default": null, - "type": "283" + "type": "287" } ], "meta-type": "object" @@ -2361,7 +2376,7 @@ { "name": "io-status", "default": null, - "type": "284" + "type": "288" } ], "meta-type": "object" @@ -2402,12 +2417,12 @@ }, { "name": "stats", - "type": "285" + "type": "289" }, { "name": "driver-specific", "default": null, - "type": "286" + "type": "290" }, { "name": "parent", @@ -2460,7 +2475,7 @@ }, { "name": "io-status", - "type": "284" + "type": "288" }, { "name": "ready", @@ -2468,7 +2483,7 @@ }, { "name": "status", - "type": "281" + "type": "285" }, { "name": "auto-finalize", @@ -2536,7 +2551,7 @@ { "name": "mode", "default": null, - "type": "287" + "type": "291" } ], "meta-type": "object" @@ -2624,7 +2639,7 @@ { "name": "on-error", "default": null, - "type": "288" + "type": "292" }, { "name": "filter-node-name", @@ -2658,7 +2673,7 @@ }, { "name": "sync", - "type": "289" + "type": "293" }, { "name": "speed", @@ -2673,7 +2688,7 @@ { "name": "bitmap-mode", "default": null, - "type": "290" + "type": "294" }, { "name": "compress", @@ -2683,12 +2698,12 @@ { "name": "on-source-error", "default": null, - "type": "288" + "type": "292" }, { "name": "on-target-error", "default": null, - "type": "288" + "type": "292" }, { "name": "auto-finalize", @@ -2708,7 +2723,7 @@ { "name": "x-perf", "default": null, - "type": "291", + "type": "295", "features": [ "unstable" ] @@ -2725,7 +2740,7 @@ { "name": "mode", "default": null, - "type": "287" + "type": "291" } ], "meta-type": "object" @@ -2744,7 +2759,7 @@ }, { "name": "sync", - "type": "289" + "type": "293" }, { "name": "speed", @@ -2759,7 +2774,7 @@ { "name": "bitmap-mode", "default": null, - "type": "290" + "type": "294" }, { "name": "compress", @@ -2769,12 +2784,12 @@ { "name": "on-source-error", "default": null, - "type": "288" + "type": "292" }, { "name": "on-target-error", "default": null, - "type": "288" + "type": "292" }, { "name": "auto-finalize", @@ -2794,7 +2809,7 @@ { "name": "x-perf", "default": null, - "type": "291", + "type": "295", "features": [ "unstable" ] @@ -2857,7 +2872,7 @@ }, { "name": "detect_zeroes", - "type": "292" + "type": "296" }, { "name": "bps", @@ -2885,7 +2900,7 @@ }, { "name": "image", - "type": "293" + "type": "297" }, { "name": "bps_max", @@ -2959,7 +2974,7 @@ }, { "name": "cache", - "type": "294" + "type": "298" }, { "name": "write_threshold", @@ -2968,7 +2983,7 @@ { "name": "dirty-bitmaps", "default": null, - "type": "[295]" + "type": "[299]" } ], "meta-type": "object" @@ -2978,11 +2993,11 @@ "members": [ { "name": "nodes", - "type": "[296]" + "type": "[300]" }, { "name": "edges", - "type": "[297]" + "type": "[301]" } ], "meta-type": "object" @@ -3020,12 +3035,12 @@ }, { "name": "sync", - "type": "289" + "type": "293" }, { "name": "mode", "default": null, - "type": "287" + "type": "291" }, { "name": "speed", @@ -3045,12 +3060,12 @@ { "name": "on-source-error", "default": null, - "type": "288" + "type": "292" }, { "name": "on-target-error", "default": null, - "type": "288" + "type": "292" }, { "name": "unmap", @@ -3060,7 +3075,7 @@ { "name": "copy-mode", "default": null, - "type": "298" + "type": "302" }, { "name": "auto-finalize", @@ -3131,7 +3146,7 @@ }, { "name": "bitmaps", - "type": "[299]" + "type": "[303]" } ], "meta-type": "object" @@ -3169,7 +3184,7 @@ }, { "name": "sync", - "type": "289" + "type": "293" }, { "name": "speed", @@ -3189,12 +3204,12 @@ { "name": "on-source-error", "default": null, - "type": "288" + "type": "292" }, { "name": "on-target-error", "default": null, - "type": "288" + "type": "292" }, { "name": "filter-node-name", @@ -3204,7 +3219,7 @@ { "name": "copy-mode", "default": null, - "type": "298" + "type": "302" }, { "name": "auto-finalize", @@ -3259,7 +3274,7 @@ { "name": "on-error", "default": null, - "type": "288" + "type": "292" }, { "name": "filter-node-name", @@ -3364,197 +3379,197 @@ "variants": [ { "case": "blkdebug", - "type": "303" + "type": "307" }, { "case": "blklogwrites", - "type": "304" + "type": "308" }, { "case": "blkverify", - "type": "305" + "type": "309" }, { "case": "blkreplay", - "type": "306" + "type": "310" }, { "case": "bochs", - "type": "307" + "type": "311" }, { "case": "cloop", - "type": "307" + "type": "311" }, { "case": "compress", - "type": "307" + "type": "311" }, { "case": "copy-before-write", - "type": "308" + "type": "312" }, { "case": "copy-on-read", - "type": "309" + "type": "313" }, { "case": "dmg", - "type": "307" + "type": "311" }, { "case": "file", - "type": "310" + "type": "314" }, { "case": "ftp", - "type": "311" + "type": "315" }, { "case": "ftps", - "type": "312" + "type": "316" }, { "case": "gluster", - "type": "313" + "type": "317" }, { "case": "host_cdrom", - "type": "310" + "type": "314" }, { "case": "host_device", - "type": "310" + "type": "314" }, { "case": "http", - "type": "314" + "type": "318" }, { "case": "https", - "type": "315" + "type": "319" }, { "case": "io_uring", - "type": "316" + "type": "320" }, { "case": "iscsi", - "type": "317" + "type": "321" }, { "case": "luks", - "type": "318" + "type": "322" }, { "case": "nbd", - "type": "319" + "type": "323" }, { "case": "nfs", - "type": "320" + "type": "324" }, { "case": "null-aio", - "type": "321" + "type": "325" }, { "case": "null-co", - "type": "321" + "type": "325" }, { "case": "nvme", - "type": "322" + "type": "326" }, { "case": "nvme-io_uring", - "type": "323" + "type": "327" }, { "case": "parallels", - "type": "307" + "type": "311" }, { "case": "preallocate", - "type": "324" + "type": "328" }, { "case": "qcow2", - "type": "325" + "type": "329" }, { "case": "qcow", - "type": "326" + "type": "330" }, { "case": "qed", - "type": "327" + "type": "331" }, { "case": "quorum", - "type": "328" + "type": "332" }, { "case": "raw", - "type": "329" + "type": "333" }, { "case": "rbd", - "type": "330" + "type": "334" }, { "case": "replication", - "type": "331" + "type": "335" }, { "case": "snapshot-access", - "type": "307" + "type": "311" }, { "case": "ssh", - "type": "332" + "type": "336" }, { "case": "throttle", - "type": "333" + "type": "337" }, { "case": "vdi", - "type": "307" + "type": "311" }, { "case": "vhdx", - "type": "307" + "type": "311" }, { "case": "virtio-blk-vfio-pci", - "type": "334" + "type": "338" }, { "case": "virtio-blk-vhost-user", - "type": "335" + "type": "339" }, { "case": "virtio-blk-vhost-vdpa", - "type": "336" + "type": "340" }, { "case": "vmdk", - "type": "327" + "type": "331" }, { "case": "vpc", - "type": "307" + "type": "311" }, { "case": "vvfat", - "type": "337" + "type": "341" } ], "members": [ { "name": "driver", - "type": "300" + "type": "304" }, { "name": "node-name", @@ -3564,12 +3579,12 @@ { "name": "discard", "default": null, - "type": "301" + "type": "305" }, { "name": "cache", "default": null, - "type": "302" + "type": "306" }, { "name": "read-only", @@ -3589,7 +3604,7 @@ { "name": "detect-zeroes", "default": null, - "type": "292" + "type": "296" } ], "meta-type": "object" @@ -3623,7 +3638,7 @@ }, { "name": "options", - "type": "338" + "type": "342" } ], "meta-type": "object" @@ -3641,7 +3656,7 @@ }, { "name": "options", - "type": "339" + "type": "343" }, { "name": "force", @@ -3698,11 +3713,11 @@ }, { "name": "operation", - "type": "340" + "type": "344" }, { "name": "action", - "type": "341" + "type": "345" }, { "name": "nospace", @@ -3721,7 +3736,7 @@ "members": [ { "name": "type", - "type": "282" + "type": "286" }, { "name": "device", @@ -3752,7 +3767,7 @@ "members": [ { "name": "type", - "type": "282" + "type": "286" }, { "name": "device", @@ -3782,11 +3797,11 @@ }, { "name": "operation", - "type": "340" + "type": "344" }, { "name": "action", - "type": "341" + "type": "345" } ], "meta-type": "object" @@ -3796,7 +3811,7 @@ "members": [ { "name": "type", - "type": "282" + "type": "286" }, { "name": "device", @@ -3822,7 +3837,7 @@ "members": [ { "name": "type", - "type": "282" + "type": "286" }, { "name": "id", @@ -3892,7 +3907,7 @@ }, { "name": "iothread", - "type": "342" + "type": "346" }, { "name": "force", @@ -3925,7 +3940,7 @@ "members": [ { "name": "type", - "type": "343" + "type": "347" }, { "name": "error", @@ -4025,7 +4040,7 @@ "members": [ { "name": "addr", - "type": "344" + "type": "348" }, { "name": "tls-creds", @@ -4085,7 +4100,7 @@ { "name": "mode", "default": null, - "type": "345" + "type": "349" } ], "meta-type": "object" @@ -4096,25 +4111,25 @@ "variants": [ { "case": "nbd", - "type": "347" + "type": "351" }, { "case": "vhost-user-blk", - "type": "348" + "type": "352" }, { "case": "fuse", - "type": "349" + "type": "353" }, { "case": "vduse-blk", - "type": "350" + "type": "354" } ], "members": [ { "name": "type", - "type": "346" + "type": "350" }, { "name": "id", @@ -4157,7 +4172,7 @@ { "name": "mode", "default": null, - "type": "345" + "type": "349" } ], "meta-type": "object" @@ -4186,7 +4201,7 @@ }, { "name": "type", - "type": "346" + "type": "350" }, { "name": "node-name", @@ -4251,7 +4266,7 @@ { "name": "format", "default": null, - "type": "351" + "type": "355" } ], "meta-type": "object" @@ -4270,7 +4285,7 @@ { "name": "format", "default": null, - "type": "351" + "type": "355" } ], "meta-type": "object" @@ -4289,7 +4304,7 @@ }, { "name": "backend", - "type": "352" + "type": "356" } ], "meta-type": "object" @@ -4314,7 +4329,7 @@ }, { "name": "backend", - "type": "352" + "type": "356" } ], "meta-type": "object" @@ -4382,7 +4397,7 @@ { "name": "format", "default": null, - "type": "353" + "type": "357" } ], "meta-type": "object" @@ -4392,7 +4407,7 @@ "members": [ { "name": "status", - "type": "354" + "type": "358" }, { "name": "completed", @@ -4425,7 +4440,7 @@ "members": [ { "name": "formats", - "type": "[353]" + "type": "[357]" } ], "meta-type": "object" @@ -4450,55 +4465,55 @@ "variants": [ { "case": "nic", - "type": "356" + "type": "360" }, { "case": "user", - "type": "357" + "type": "361" }, { "case": "tap", - "type": "358" + "type": "362" }, { "case": "l2tpv3", - "type": "359" + "type": "363" }, { "case": "socket", - "type": "360" + "type": "364" }, { "case": "stream", - "type": "361" + "type": "365" }, { "case": "dgram", - "type": "362" + "type": "366" }, { "case": "vde", - "type": "363" + "type": "367" }, { "case": "bridge", - "type": "364" + "type": "368" }, { "case": "hubport", - "type": "365" + "type": "369" }, { "case": "netmap", - "type": "366" + "type": "370" }, { "case": "vhost-user", - "type": "367" + "type": "371" }, { "case": "vhost-vdpa", - "type": "368" + "type": "372" }, { "case": "none", @@ -4512,7 +4527,7 @@ }, { "name": "type", - "type": "355" + "type": "359" } ], "meta-type": "object" @@ -4556,15 +4571,15 @@ }, { "name": "multicast", - "type": "372" + "type": "376" }, { "name": "unicast", - "type": "372" + "type": "376" }, { "name": "vlan", - "type": "372" + "type": "376" }, { "name": "broadcast-allowed", @@ -4663,7 +4678,7 @@ }, { "name": "addr", - "type": "373" + "type": "377" } ], "meta-type": "object" @@ -4764,11 +4779,11 @@ }, { "name": "duplex", - "type": "374" + "type": "378" }, { "name": "autoneg", - "type": "375" + "type": "379" } ], "meta-type": "object" @@ -4806,15 +4821,15 @@ }, { "name": "key", - "type": "376" + "type": "380" }, { "name": "mask", - "type": "377" + "type": "381" }, { "name": "action", - "type": "378" + "type": "382" } ], "meta-type": "object" @@ -4972,7 +4987,7 @@ }, { "name": "options", - "type": "379" + "type": "383" } ], "meta-type": "object" @@ -4983,7 +4998,7 @@ "variants": [ { "case": "vnc", - "type": "382" + "type": "386" }, { "case": "spice", @@ -4993,7 +5008,7 @@ "members": [ { "name": "protocol", - "type": "380" + "type": "384" }, { "name": "password", @@ -5002,7 +5017,7 @@ { "name": "connected", "default": null, - "type": "381" + "type": "385" } ], "meta-type": "object" @@ -5013,7 +5028,7 @@ "variants": [ { "case": "vnc", - "type": "383" + "type": "387" }, { "case": "spice", @@ -5023,7 +5038,7 @@ "members": [ { "name": "protocol", - "type": "380" + "type": "384" }, { "name": "time", @@ -5052,7 +5067,7 @@ { "name": "format", "default": null, - "type": "384" + "type": "388" } ], "meta-type": "object" @@ -5095,12 +5110,12 @@ }, { "name": "mouse-mode", - "type": "385" + "type": "389" }, { "name": "channels", "default": null, - "type": "[386]" + "type": "[390]" } ], "meta-type": "object" @@ -5110,11 +5125,11 @@ "members": [ { "name": "server", - "type": "387" + "type": "391" }, { "name": "client", - "type": "387" + "type": "391" } ], "meta-type": "object" @@ -5124,11 +5139,11 @@ "members": [ { "name": "server", - "type": "388" + "type": "392" }, { "name": "client", - "type": "386" + "type": "390" } ], "meta-type": "object" @@ -5138,11 +5153,11 @@ "members": [ { "name": "server", - "type": "387" + "type": "391" }, { "name": "client", - "type": "387" + "type": "391" } ], "meta-type": "object" @@ -5162,7 +5177,7 @@ { "name": "family", "default": null, - "type": "389" + "type": "393" }, { "name": "service", @@ -5177,7 +5192,7 @@ { "name": "clients", "default": null, - "type": "[390]" + "type": "[394]" } ], "meta-type": "object" @@ -5196,20 +5211,20 @@ }, { "name": "server", - "type": "[391]" + "type": "[395]" }, { "name": "clients", - "type": "[390]" + "type": "[394]" }, { "name": "auth", - "type": "392" + "type": "396" }, { "name": "vencrypt", "default": null, - "type": "393" + "type": "397" }, { "name": "display", @@ -5234,11 +5249,11 @@ "members": [ { "name": "server", - "type": "394" + "type": "398" }, { "name": "client", - "type": "395" + "type": "399" } ], "meta-type": "object" @@ -5248,11 +5263,11 @@ "members": [ { "name": "server", - "type": "394" + "type": "398" }, { "name": "client", - "type": "390" + "type": "394" } ], "meta-type": "object" @@ -5262,11 +5277,11 @@ "members": [ { "name": "server", - "type": "394" + "type": "398" }, { "name": "client", - "type": "390" + "type": "394" } ], "meta-type": "object" @@ -5303,7 +5318,7 @@ "members": [ { "name": "keys", - "type": "[396]" + "type": "[400]" }, { "name": "hold-time", @@ -5328,7 +5343,7 @@ }, { "name": "events", - "type": "[397]" + "type": "[401]" } ], "meta-type": "object" @@ -5339,19 +5354,19 @@ "variants": [ { "case": "curses", - "type": "402" + "type": "406" }, { "case": "egl-headless", - "type": "403" + "type": "407" }, { "case": "dbus", - "type": "404" + "type": "408" }, { "case": "sdl", - "type": "405" + "type": "409" }, { "case": "default", @@ -5369,7 +5384,7 @@ "members": [ { "name": "type", - "type": "398" + "type": "402" }, { "name": "full-screen", @@ -5389,7 +5404,7 @@ { "name": "gl", "default": null, - "type": "399" + "type": "403" } ], "meta-type": "object" @@ -5400,13 +5415,13 @@ "variants": [ { "case": "vnc", - "type": "407" + "type": "411" } ], "members": [ { "name": "type", - "type": "406" + "type": "410" } ], "meta-type": "object" @@ -5417,13 +5432,13 @@ "variants": [ { "case": "vnc", - "type": "409" + "type": "413" } ], "members": [ { "name": "type", - "type": "408" + "type": "412" } ], "meta-type": "object" @@ -5463,27 +5478,27 @@ { "name": "status", "default": null, - "type": "410" + "type": "414" }, { "name": "ram", "default": null, - "type": "411" + "type": "415" }, { "name": "disk", "default": null, - "type": "411" + "type": "415" }, { "name": "vfio", "default": null, - "type": "412" + "type": "416" }, { "name": "xbzrle-cache", "default": null, - "type": "413" + "type": "417" }, { "name": "total-time", @@ -5533,12 +5548,12 @@ { "name": "compression", "default": null, - "type": "414" + "type": "418" }, { "name": "socket-address", "default": null, - "type": "[373]" + "type": "[377]" } ], "meta-type": "object" @@ -5563,7 +5578,7 @@ "members": [ { "name": "capability", - "type": "415" + "type": "419" }, { "name": "state", @@ -5638,17 +5653,17 @@ { "name": "tls-creds", "default": null, - "type": "342" + "type": "346" }, { "name": "tls-hostname", "default": null, - "type": "342" + "type": "346" }, { "name": "tls-authz", "default": null, - "type": "342" + "type": "346" }, { "name": "max-bandwidth", @@ -5696,7 +5711,7 @@ { "name": "multifd-compression", "default": null, - "type": "416" + "type": "420" }, { "name": "multifd-zlib-level", @@ -5711,7 +5726,7 @@ { "name": "block-bitmap-mapping", "default": null, - "type": "[417]" + "type": "[421]" } ], "meta-type": "object" @@ -5840,7 +5855,7 @@ { "name": "multifd-compression", "default": null, - "type": "416" + "type": "420" }, { "name": "multifd-zlib-level", @@ -5855,7 +5870,7 @@ { "name": "block-bitmap-mapping", "default": null, - "type": "[417]" + "type": "[421]" } ], "meta-type": "object" @@ -5865,7 +5880,7 @@ "members": [ { "name": "status", - "type": "410" + "type": "414" } ], "meta-type": "object" @@ -5885,11 +5900,11 @@ "members": [ { "name": "mode", - "type": "418" + "type": "422" }, { "name": "reason", - "type": "419" + "type": "423" } ], "meta-type": "object" @@ -5899,7 +5914,7 @@ "members": [ { "name": "state", - "type": "410" + "type": "414" } ], "meta-type": "object" @@ -6018,15 +6033,15 @@ "members": [ { "name": "mode", - "type": "418" + "type": "422" }, { "name": "last-mode", - "type": "418" + "type": "422" }, { "name": "reason", - "type": "419" + "type": "423" } ], "meta-type": "object" @@ -6066,7 +6081,7 @@ { "name": "mode", "default": null, - "type": "420" + "type": "424" } ], "meta-type": "object" @@ -6081,7 +6096,7 @@ }, { "name": "status", - "type": "421" + "type": "425" }, { "name": "start-time", @@ -6097,12 +6112,12 @@ }, { "name": "mode", - "type": "420" + "type": "424" }, { "name": "vcpu-dirty-rate", "default": null, - "type": "[422]" + "type": "[426]" } ], "meta-type": "object" @@ -6242,12 +6257,12 @@ "members": [ { "name": "actions", - "type": "[423]" + "type": "[427]" }, { "name": "properties", "default": null, - "type": "424" + "type": "428" } ], "meta-type": "object" @@ -6284,7 +6299,7 @@ }, { "name": "state", - "type": "425" + "type": "429" }, { "name": "vcpu", @@ -6329,7 +6344,7 @@ { "name": "enable", "default": null, - "type": "[426]" + "type": "[430]" } ], "meta-type": "object" @@ -6339,7 +6354,7 @@ "members": [ { "name": "qemu", - "type": "427" + "type": "431" }, { "name": "package", @@ -6374,31 +6389,31 @@ "variants": [ { "case": "builtin", - "type": "429" + "type": "433" }, { "case": "enum", - "type": "430" + "type": "434" }, { "case": "array", - "type": "431" + "type": "435" }, { "case": "object", - "type": "432" + "type": "436" }, { "case": "alternate", - "type": "433" + "type": "437" }, { "case": "command", - "type": "434" + "type": "438" }, { "case": "event", - "type": "435" + "type": "439" } ], "members": [ @@ -6408,7 +6423,7 @@ }, { "name": "meta-type", - "type": "428" + "type": "432" }, { "name": "features", @@ -6551,167 +6566,167 @@ "variants": [ { "case": "authz-list", - "type": "437" + "type": "441" }, { "case": "authz-listfile", - "type": "438" + "type": "442" }, { "case": "authz-pam", - "type": "439" + "type": "443" }, { "case": "authz-simple", - "type": "440" + "type": "444" }, { "case": "can-host-socketcan", - "type": "441" + "type": "445" }, { "case": "colo-compare", - "type": "442" + "type": "446" }, { "case": "cryptodev-backend", - "type": "443" + "type": "447" }, { "case": "cryptodev-backend-builtin", - "type": "443" + "type": "447" }, { "case": "cryptodev-backend-lkcf", - "type": "443" + "type": "447" }, { "case": "cryptodev-vhost-user", - "type": "444" + "type": "448" }, { "case": "dbus-vmstate", - "type": "445" + "type": "449" }, { "case": "filter-buffer", - "type": "446" + "type": "450" }, { "case": "filter-dump", - "type": "447" + "type": "451" }, { "case": "filter-mirror", - "type": "448" + "type": "452" }, { "case": "filter-redirector", - "type": "449" + "type": "453" }, { "case": "filter-replay", - "type": "450" + "type": "454" }, { "case": "filter-rewriter", - "type": "451" + "type": "455" }, { "case": "input-barrier", - "type": "452" + "type": "456" }, { "case": "input-linux", - "type": "453" + "type": "457" }, { "case": "iothread", - "type": "454" + "type": "458" }, { "case": "main-loop", - "type": "455" + "type": "459" }, { "case": "memory-backend-epc", - "type": "456" + "type": "460" }, { "case": "memory-backend-file", - "type": "457" + "type": "461" }, { "case": "memory-backend-memfd", - "type": "458" + "type": "462" }, { "case": "memory-backend-ram", - "type": "459" + "type": "463" }, { "case": "pr-manager-helper", - "type": "460" + "type": "464" }, { "case": "qtest", - "type": "461" + "type": "465" }, { "case": "rng-builtin", - "type": "462" + "type": "466" }, { "case": "rng-egd", - "type": "463" + "type": "467" }, { "case": "rng-random", - "type": "464" + "type": "468" }, { "case": "secret", - "type": "465" + "type": "469" }, { "case": "secret_keyring", - "type": "466" + "type": "470" }, { "case": "sev-guest", - "type": "467" + "type": "471" }, { "case": "thread-context", - "type": "468" + "type": "472" }, { "case": "throttle-group", - "type": "469" + "type": "473" }, { "case": "tls-creds-anon", - "type": "470" + "type": "474" }, { "case": "tls-creds-psk", - "type": "471" + "type": "475" }, { "case": "tls-creds-x509", - "type": "472" + "type": "476" }, { "case": "tls-cipher-suites", - "type": "473" + "type": "477" }, { "case": "x-remote-object", - "type": "474" + "type": "478" }, { "case": "x-vfio-user-server", - "type": "475" + "type": "479" }, { "case": "can-bus", @@ -6729,7 +6744,7 @@ "members": [ { "name": "qom-type", - "type": "436" + "type": "440" }, { "name": "id", @@ -6829,7 +6844,7 @@ "variants": [ { "case": "s390x", - "type": "478" + "type": "482" }, { "case": "aarch64", @@ -6968,11 +6983,11 @@ { "name": "props", "default": null, - "type": "476" + "type": "480" }, { "name": "target", - "type": "477" + "type": "481" } ], "meta-type": "object" @@ -7047,7 +7062,7 @@ "members": [ { "name": "arch", - "type": "477" + "type": "481" } ], "meta-type": "object" @@ -7171,7 +7186,7 @@ }, { "name": "policy", - "type": "479" + "type": "483" } ], "meta-type": "object" @@ -7194,7 +7209,7 @@ }, { "name": "props", - "type": "476" + "type": "480" }, { "name": "qom-path", @@ -7210,29 +7225,29 @@ "variants": [ { "case": "node", - "type": "481" + "type": "485" }, { "case": "dist", - "type": "482" + "type": "486" }, { "case": "cpu", - "type": "483" + "type": "487" }, { "case": "hmat-lb", - "type": "484" + "type": "488" }, { "case": "hmat-cache", - "type": "485" + "type": "489" } ], "members": [ { "name": "type", - "type": "480" + "type": "484" } ], "meta-type": "object" @@ -7293,29 +7308,29 @@ "variants": [ { "case": "dimm", - "type": "487" + "type": "491" }, { "case": "nvdimm", - "type": "487" + "type": "491" }, { "case": "virtio-pmem", - "type": "488" + "type": "492" }, { "case": "virtio-mem", - "type": "489" + "type": "493" }, { "case": "sgx-epc", - "type": "490" + "type": "494" } ], "members": [ { "name": "type", - "type": "486" + "type": "490" } ], "meta-type": "object" @@ -7378,11 +7393,11 @@ "members": [ { "name": "type", - "type": "493" + "type": "497" }, { "name": "model", - "type": "491" + "type": "495" } ], "meta-type": "object" @@ -7392,7 +7407,7 @@ "members": [ { "name": "model", - "type": "491" + "type": "495" } ], "meta-type": "object" @@ -7444,7 +7459,7 @@ "members": [ { "name": "mode", - "type": "494" + "type": "498" }, { "name": "filename", @@ -7499,11 +7514,11 @@ "variants": [ { "case": "block-node", - "type": "496" + "type": "500" }, { "case": "chardev", - "type": "497" + "type": "501" }, { "case": "migration", @@ -7513,7 +7528,7 @@ "members": [ { "name": "type", - "type": "495" + "type": "499" } ], "meta-type": "object" @@ -7682,7 +7697,7 @@ }, { "name": "fds", - "type": "[498]" + "type": "[502]" } ], "meta-type": "object" @@ -7712,7 +7727,7 @@ }, { "name": "parameters", - "type": "[499]" + "type": "[503]" } ], "meta-type": "object" @@ -7778,7 +7793,7 @@ }, { "name": "state", - "type": "500" + "type": "504" }, { "name": "handle", @@ -7883,7 +7898,7 @@ }, { "name": "sections", - "type": "[501]" + "type": "[505]" } ], "meta-type": "object" @@ -7906,7 +7921,7 @@ }, { "name": "type", - "type": "502" + "type": "506" }, { "name": "remote-domain", @@ -7948,35 +7963,35 @@ "variants": [ { "case": "none", - "type": "504" + "type": "508" }, { "case": "alsa", - "type": "505" + "type": "509" }, { "case": "dbus", - "type": "504" + "type": "508" }, { "case": "oss", - "type": "509" + "type": "513" }, { "case": "pa", - "type": "510" + "type": "514" }, { "case": "sdl", - "type": "512" + "type": "516" }, { "case": "spice", - "type": "504" + "type": "508" }, { "case": "wav", - "type": "514" + "type": "518" } ], "members": [ @@ -7986,7 +8001,7 @@ }, { "name": "driver", - "type": "503" + "type": "507" }, { "name": "timer-period", @@ -8015,7 +8030,7 @@ }, { "name": "slot-type", - "type": "515" + "type": "519" }, { "name": "source", @@ -8052,7 +8067,7 @@ }, { "name": "devices", - "type": "[516]" + "type": "[520]" } ], "meta-type": "object" @@ -8063,7 +8078,7 @@ "variants": [ { "case": "vcpu", - "type": "519" + "type": "523" }, { "case": "vm", @@ -8077,12 +8092,12 @@ "members": [ { "name": "target", - "type": "517" + "type": "521" }, { "name": "providers", "default": null, - "type": "[518]" + "type": "[522]" } ], "meta-type": "object" @@ -8097,7 +8112,7 @@ "members": [ { "name": "provider", - "type": "520" + "type": "524" }, { "name": "qom-path", @@ -8106,7 +8121,7 @@ }, { "name": "stats", - "type": "[521]" + "type": "[525]" } ], "meta-type": "object" @@ -8117,7 +8132,7 @@ { "name": "provider", "default": null, - "type": "520" + "type": "524" } ], "meta-type": "object" @@ -8132,15 +8147,15 @@ "members": [ { "name": "provider", - "type": "520" + "type": "524" }, { "name": "target", - "type": "517" + "type": "521" }, { "name": "stats", - "type": "[522]" + "type": "[526]" } ], "meta-type": "object" @@ -8195,15 +8210,15 @@ }, { "name": "guest-features", - "type": "523" + "type": "527" }, { "name": "host-features", - "type": "523" + "type": "527" }, { "name": "backend-features", - "type": "523" + "type": "527" }, { "name": "num-vqs", @@ -8211,7 +8226,7 @@ }, { "name": "status", - "type": "524" + "type": "528" }, { "name": "isr", @@ -8260,7 +8275,7 @@ { "name": "vhost-dev", "default": null, - "type": "525" + "type": "529" } ], "meta-type": "object" @@ -8447,15 +8462,15 @@ }, { "name": "descs", - "type": "[526]" + "type": "[530]" }, { "name": "avail", - "type": "527" + "type": "531" }, { "name": "used", - "type": "528" + "type": "532" } ], "meta-type": "object" @@ -8474,11 +8489,11 @@ }, { "name": "service", - "type": "[529]" + "type": "[533]" }, { "name": "client", - "type": "[530]" + "type": "[534]" } ], "meta-type": "object" @@ -8491,8 +8506,48 @@ "type": "str" }, { - "name": "errors", - "type": "[531]" + "name": "log", + "type": "535" + }, + { + "name": "flags", + "type": "int" + }, + { + "name": "dpa", + "type": "int" + }, + { + "name": "descriptor", + "type": "int" + }, + { + "name": "type", + "type": "int" + }, + { + "name": "transaction-type", + "type": "int" + }, + { + "name": "channel", + "default": null, + "type": "int" + }, + { + "name": "rank", + "default": null, + "type": "int" + }, + { + "name": "device", + "default": null, + "type": "int" + }, + { + "name": "component-id", + "default": null, + "type": "str" } ], "meta-type": "object" @@ -8504,9 +8559,169 @@ "name": "path", "type": "str" }, + { + "name": "log", + "type": "535" + }, + { + "name": "flags", + "type": "int" + }, + { + "name": "dpa", + "type": "int" + }, + { + "name": "descriptor", + "type": "int" + }, { "name": "type", - "type": "532" + "type": "int" + }, + { + "name": "transaction-type", + "type": "int" + }, + { + "name": "channel", + "default": null, + "type": "int" + }, + { + "name": "rank", + "default": null, + "type": "int" + }, + { + "name": "nibble-mask", + "default": null, + "type": "int" + }, + { + "name": "bank-group", + "default": null, + "type": "int" + }, + { + "name": "bank", + "default": null, + "type": "int" + }, + { + "name": "row", + "default": null, + "type": "int" + }, + { + "name": "column", + "default": null, + "type": "int" + }, + { + "name": "correction-mask", + "default": null, + "type": "[int]" + } + ], + "meta-type": "object" + }, + { + "name": "270", + "members": [ + { + "name": "path", + "type": "str" + }, + { + "name": "log", + "type": "535" + }, + { + "name": "flags", + "type": "int" + }, + { + "name": "type", + "type": "int" + }, + { + "name": "health-status", + "type": "int" + }, + { + "name": "media-status", + "type": "int" + }, + { + "name": "additional-status", + "type": "int" + }, + { + "name": "life-used", + "type": "int" + }, + { + "name": "temperature", + "type": "int" + }, + { + "name": "dirty-shutdown-count", + "type": "int" + }, + { + "name": "corrected-volatile-error-count", + "type": "int" + }, + { + "name": "corrected-persistent-error-count", + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "271", + "members": [ + { + "name": "path", + "type": "str" + }, + { + "name": "start", + "type": "int" + }, + { + "name": "length", + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "272", + "members": [ + { + "name": "path", + "type": "str" + }, + { + "name": "errors", + "type": "[536]" + } + ], + "meta-type": "object" + }, + { + "name": "273", + "members": [ + { + "name": "path", + "type": "str" + }, + { + "name": "type", + "type": "537" } ], "meta-type": "object" @@ -8517,7 +8732,7 @@ "meta-type": "builtin" }, { - "name": "270", + "name": "274", "members": [ { "name": "debug" @@ -8589,7 +8804,7 @@ ] }, { - "name": "271", + "name": "275", "members": [ { "name": "none" @@ -8641,7 +8856,7 @@ ] }, { - "name": "272", + "name": "276", "members": [ { "name": "reset" @@ -8677,7 +8892,7 @@ ] }, { - "name": "273", + "name": "277", "members": [ { "name": "reset" @@ -8693,7 +8908,7 @@ ] }, { - "name": "274", + "name": "278", "members": [ { "name": "poweroff" @@ -8709,7 +8924,7 @@ ] }, { - "name": "275", + "name": "279", "members": [ { "name": "pause" @@ -8733,7 +8948,7 @@ ] }, { - "name": "276", + "name": "280", "members": [ { "name": "pause" @@ -8753,28 +8968,28 @@ ] }, { - "name": "277", + "name": "281", "tag": "type", "variants": [ { "case": "hyper-v", - "type": "534" + "type": "539" }, { "case": "s390", - "type": "535" + "type": "540" } ], "members": [ { "name": "type", - "type": "533" + "type": "538" } ], "meta-type": "object" }, { - "name": "278", + "name": "282", "members": [ { "name": "hypervisor" @@ -8790,7 +9005,7 @@ ] }, { - "name": "279", + "name": "283", "members": [ { "name": "ignore" @@ -8814,7 +9029,7 @@ ] }, { - "name": "280", + "name": "284", "members": [ { "name": "action-required", @@ -8828,7 +9043,7 @@ "meta-type": "object" }, { - "name": "281", + "name": "285", "members": [ { "name": "undefined" @@ -8880,7 +9095,7 @@ ] }, { - "name": "282", + "name": "286", "members": [ { "name": "commit" @@ -8929,7 +9144,7 @@ "meta-type": "builtin" }, { - "name": "283", + "name": "287", "members": [ { "name": "retain" @@ -8954,7 +9169,7 @@ "meta-type": "array" }, { - "name": "284", + "name": "288", "members": [ { "name": "ok" @@ -8974,7 +9189,7 @@ ] }, { - "name": "285", + "name": "289", "members": [ { "name": "rd_bytes", @@ -9107,46 +9322,46 @@ }, { "name": "timed_stats", - "type": "[536]" + "type": "[541]" }, { "name": "rd_latency_histogram", "default": null, - "type": "537" + "type": "542" }, { "name": "wr_latency_histogram", "default": null, - "type": "537" + "type": "542" }, { "name": "zone_append_latency_histogram", "default": null, - "type": "537" + "type": "542" }, { "name": "flush_latency_histogram", "default": null, - "type": "537" + "type": "542" } ], "meta-type": "object" }, { - "name": "286", + "name": "290", "tag": "driver", "variants": [ { "case": "file", - "type": "538" + "type": "543" }, { "case": "host_device", - "type": "538" + "type": "543" }, { "case": "nvme", - "type": "539" + "type": "544" }, { "case": "blkdebug", @@ -9328,13 +9543,13 @@ "members": [ { "name": "driver", - "type": "300" + "type": "304" } ], "meta-type": "object" }, { - "name": "287", + "name": "291", "members": [ { "name": "existing" @@ -9350,7 +9565,7 @@ ] }, { - "name": "288", + "name": "292", "members": [ { "name": "report" @@ -9378,7 +9593,7 @@ ] }, { - "name": "289", + "name": "293", "members": [ { "name": "top" @@ -9406,7 +9621,7 @@ ] }, { - "name": "290", + "name": "294", "members": [ { "name": "on-success" @@ -9426,7 +9641,7 @@ ] }, { - "name": "291", + "name": "295", "members": [ { "name": "use-copy-range", @@ -9447,7 +9662,7 @@ "meta-type": "object" }, { - "name": "292", + "name": "296", "members": [ { "name": "off" @@ -9467,7 +9682,7 @@ ] }, { - "name": "293", + "name": "297", "members": [ { "name": "filename", @@ -9529,18 +9744,18 @@ { "name": "format-specific", "default": null, - "type": "540" + "type": "545" }, { "name": "backing-image", "default": null, - "type": "293" + "type": "297" } ], "meta-type": "object" }, { - "name": "294", + "name": "298", "members": [ { "name": "writeback", @@ -9558,12 +9773,12 @@ "meta-type": "object" }, { - "name": "[295]", - "element-type": "295", + "name": "[299]", + "element-type": "299", "meta-type": "array" }, { - "name": "295", + "name": "299", "members": [ { "name": "name", @@ -9599,12 +9814,12 @@ "meta-type": "object" }, { - "name": "[296]", - "element-type": "296", + "name": "[300]", + "element-type": "300", "meta-type": "array" }, { - "name": "296", + "name": "300", "members": [ { "name": "id", @@ -9612,7 +9827,7 @@ }, { "name": "type", - "type": "541" + "type": "546" }, { "name": "name", @@ -9622,12 +9837,12 @@ "meta-type": "object" }, { - "name": "[297]", - "element-type": "297", + "name": "[301]", + "element-type": "301", "meta-type": "array" }, { - "name": "297", + "name": "301", "members": [ { "name": "parent", @@ -9643,17 +9858,17 @@ }, { "name": "perm", - "type": "[542]" + "type": "[547]" }, { "name": "shared-perm", - "type": "[542]" + "type": "[547]" } ], "meta-type": "object" }, { - "name": "298", + "name": "302", "members": [ { "name": "background" @@ -9669,12 +9884,12 @@ ] }, { - "name": "[299]", - "element-type": "299", + "name": "[303]", + "element-type": "303", "meta-type": "array" }, { - "name": "299", + "name": "303", "members": [ { "type": "str" @@ -9686,7 +9901,7 @@ "meta-type": "alternate" }, { - "name": "300", + "name": "304", "members": [ { "name": "blkdebug" @@ -9882,7 +10097,7 @@ ] }, { - "name": "301", + "name": "305", "members": [ { "name": "ignore" @@ -9898,7 +10113,7 @@ ] }, { - "name": "302", + "name": "306", "members": [ { "name": "direct", @@ -9914,11 +10129,11 @@ "meta-type": "object" }, { - "name": "303", + "name": "307", "members": [ { "name": "image", - "type": "543" + "type": "548" }, { "name": "config", @@ -9958,36 +10173,36 @@ { "name": "inject-error", "default": null, - "type": "[544]" + "type": "[549]" }, { "name": "set-state", "default": null, - "type": "[545]" + "type": "[550]" }, { "name": "take-child-perms", "default": null, - "type": "[542]" + "type": "[547]" }, { "name": "unshare-child-perms", "default": null, - "type": "[542]" + "type": "[547]" } ], "meta-type": "object" }, { - "name": "304", + "name": "308", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "log", - "type": "543" + "type": "548" }, { "name": "log-sector-size", @@ -10008,49 +10223,49 @@ "meta-type": "object" }, { - "name": "305", + "name": "309", "members": [ { "name": "test", - "type": "543" + "type": "548" }, { "name": "raw", - "type": "543" + "type": "548" } ], "meta-type": "object" }, { - "name": "306", + "name": "310", "members": [ { "name": "image", - "type": "543" + "type": "548" } ], "meta-type": "object" }, { - "name": "307", + "name": "311", "members": [ { "name": "file", - "type": "543" + "type": "548" } ], "meta-type": "object" }, { - "name": "308", + "name": "312", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "target", - "type": "543" + "type": "548" }, { "name": "bitmap", @@ -10060,7 +10275,7 @@ { "name": "on-cbw-error", "default": null, - "type": "546" + "type": "551" }, { "name": "cbw-timeout", @@ -10071,11 +10286,11 @@ "meta-type": "object" }, { - "name": "309", + "name": "313", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "bottom", @@ -10086,7 +10301,7 @@ "meta-type": "object" }, { - "name": "310", + "name": "314", "members": [ { "name": "filename", @@ -10100,12 +10315,12 @@ { "name": "locking", "default": null, - "type": "547" + "type": "552" }, { "name": "aio", "default": null, - "type": "548" + "type": "553" }, { "name": "aio-max-batch", @@ -10132,7 +10347,7 @@ ] }, { - "name": "311", + "name": "315", "members": [ { "name": "url", @@ -10172,7 +10387,7 @@ "meta-type": "object" }, { - "name": "312", + "name": "316", "members": [ { "name": "url", @@ -10217,7 +10432,7 @@ "meta-type": "object" }, { - "name": "313", + "name": "317", "members": [ { "name": "volume", @@ -10229,7 +10444,7 @@ }, { "name": "server", - "type": "[373]" + "type": "[377]" }, { "name": "debug", @@ -10245,7 +10460,7 @@ "meta-type": "object" }, { - "name": "314", + "name": "318", "members": [ { "name": "url", @@ -10295,7 +10510,7 @@ "meta-type": "object" }, { - "name": "315", + "name": "319", "members": [ { "name": "url", @@ -10350,7 +10565,7 @@ "meta-type": "object" }, { - "name": "316", + "name": "320", "members": [ { "name": "filename", @@ -10360,11 +10575,11 @@ "meta-type": "object" }, { - "name": "317", + "name": "321", "members": [ { "name": "transport", - "type": "549" + "type": "554" }, { "name": "portal", @@ -10397,7 +10612,7 @@ { "name": "header-digest", "default": null, - "type": "550" + "type": "555" }, { "name": "timeout", @@ -10408,11 +10623,11 @@ "meta-type": "object" }, { - "name": "318", + "name": "322", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "key-secret", @@ -10423,11 +10638,11 @@ "meta-type": "object" }, { - "name": "319", + "name": "323", "members": [ { "name": "server", - "type": "373" + "type": "377" }, { "name": "export", @@ -10466,11 +10681,11 @@ "meta-type": "object" }, { - "name": "320", + "name": "324", "members": [ { "name": "server", - "type": "551" + "type": "556" }, { "name": "path", @@ -10510,7 +10725,7 @@ "meta-type": "object" }, { - "name": "321", + "name": "325", "members": [ { "name": "size", @@ -10531,7 +10746,7 @@ "meta-type": "object" }, { - "name": "322", + "name": "326", "members": [ { "name": "device", @@ -10545,7 +10760,7 @@ "meta-type": "object" }, { - "name": "323", + "name": "327", "members": [ { "name": "path", @@ -10555,11 +10770,11 @@ "meta-type": "object" }, { - "name": "324", + "name": "328", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "prealloc-align", @@ -10575,16 +10790,16 @@ "meta-type": "object" }, { - "name": "325", + "name": "329", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "backing", "default": null, - "type": "552" + "type": "557" }, { "name": "lazy-refcounts", @@ -10614,7 +10829,7 @@ { "name": "overlap-check", "default": null, - "type": "553" + "type": "558" }, { "name": "cache-size", @@ -10644,53 +10859,53 @@ { "name": "encrypt", "default": null, - "type": "554" + "type": "559" }, { "name": "data-file", "default": null, - "type": "543" + "type": "548" } ], "meta-type": "object" }, { - "name": "326", + "name": "330", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "backing", "default": null, - "type": "552" + "type": "557" }, { "name": "encrypt", "default": null, - "type": "555" + "type": "560" } ], "meta-type": "object" }, { - "name": "327", + "name": "331", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "backing", "default": null, - "type": "552" + "type": "557" } ], "meta-type": "object" }, { - "name": "328", + "name": "332", "members": [ { "name": "blkverify", @@ -10699,7 +10914,7 @@ }, { "name": "children", - "type": "[543]" + "type": "[548]" }, { "name": "vote-threshold", @@ -10713,17 +10928,17 @@ { "name": "read-pattern", "default": null, - "type": "556" + "type": "561" } ], "meta-type": "object" }, { - "name": "329", + "name": "333", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "offset", @@ -10739,7 +10954,7 @@ "meta-type": "object" }, { - "name": "330", + "name": "334", "members": [ { "name": "pool", @@ -10767,7 +10982,7 @@ { "name": "encrypt", "default": null, - "type": "557" + "type": "562" }, { "name": "user", @@ -10777,7 +10992,7 @@ { "name": "auth-client-required", "default": null, - "type": "[558]" + "type": "[563]" }, { "name": "key-secret", @@ -10787,21 +11002,21 @@ { "name": "server", "default": null, - "type": "[559]" + "type": "[564]" } ], "meta-type": "object" }, { - "name": "331", + "name": "335", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "mode", - "type": "560" + "type": "565" }, { "name": "top-id", @@ -10812,11 +11027,11 @@ "meta-type": "object" }, { - "name": "332", + "name": "336", "members": [ { "name": "server", - "type": "561" + "type": "566" }, { "name": "path", @@ -10830,13 +11045,13 @@ { "name": "host-key-check", "default": null, - "type": "562" + "type": "567" } ], "meta-type": "object" }, { - "name": "333", + "name": "337", "members": [ { "name": "throttle-group", @@ -10844,13 +11059,13 @@ }, { "name": "file", - "type": "543" + "type": "548" } ], "meta-type": "object" }, { - "name": "334", + "name": "338", "members": [ { "name": "path", @@ -10860,7 +11075,7 @@ "meta-type": "object" }, { - "name": "335", + "name": "339", "members": [ { "name": "path", @@ -10870,7 +11085,7 @@ "meta-type": "object" }, { - "name": "336", + "name": "340", "members": [ { "name": "path", @@ -10883,7 +11098,7 @@ ] }, { - "name": "337", + "name": "341", "members": [ { "name": "dir", @@ -10918,64 +11133,64 @@ "meta-type": "array" }, { - "name": "338", + "name": "342", "tag": "driver", "variants": [ { "case": "file", - "type": "563" + "type": "568" }, { "case": "gluster", - "type": "564" + "type": "569" }, { "case": "luks", - "type": "565" + "type": "570" }, { "case": "nfs", - "type": "566" + "type": "571" }, { "case": "parallels", - "type": "567" + "type": "572" }, { "case": "qcow", - "type": "568" + "type": "573" }, { "case": "qcow2", - "type": "569" + "type": "574" }, { "case": "qed", - "type": "570" + "type": "575" }, { "case": "rbd", - "type": "571" + "type": "576" }, { "case": "ssh", - "type": "572" + "type": "577" }, { "case": "vdi", - "type": "573" + "type": "578" }, { "case": "vhdx", - "type": "574" + "type": "579" }, { "case": "vmdk", - "type": "575" + "type": "580" }, { "case": "vpc", - "type": "576" + "type": "581" }, { "case": "blkdebug", @@ -11113,22 +11328,22 @@ "members": [ { "name": "driver", - "type": "300" + "type": "304" } ], "meta-type": "object" }, { - "name": "339", + "name": "343", "tag": "driver", "variants": [ { "case": "luks", - "type": "577" + "type": "582" }, { "case": "qcow2", - "type": "578" + "type": "583" }, { "case": "blkdebug", @@ -11314,13 +11529,13 @@ "members": [ { "name": "driver", - "type": "300" + "type": "304" } ], "meta-type": "object" }, { - "name": "340", + "name": "344", "members": [ { "name": "read" @@ -11336,7 +11551,7 @@ ] }, { - "name": "341", + "name": "345", "members": [ { "name": "ignore" @@ -11356,7 +11571,7 @@ ] }, { - "name": "342", + "name": "346", "members": [ { "type": "str" @@ -11368,7 +11583,7 @@ "meta-type": "alternate" }, { - "name": "343", + "name": "347", "members": [ { "name": "read" @@ -11388,36 +11603,36 @@ ] }, { - "name": "344", + "name": "348", "tag": "type", "variants": [ { "case": "inet", - "type": "580" + "type": "585" }, { "case": "unix", - "type": "581" + "type": "586" }, { "case": "vsock", - "type": "582" + "type": "587" }, { "case": "fd", - "type": "583" + "type": "588" } ], "members": [ { "name": "type", - "type": "579" + "type": "584" } ], "meta-type": "object" }, { - "name": "345", + "name": "349", "members": [ { "name": "safe" @@ -11433,7 +11648,7 @@ ] }, { - "name": "346", + "name": "350", "members": [ { "name": "nbd" @@ -11457,7 +11672,7 @@ ] }, { - "name": "347", + "name": "351", "members": [ { "name": "name", @@ -11472,7 +11687,7 @@ { "name": "bitmaps", "default": null, - "type": "[299]" + "type": "[303]" }, { "name": "allocation-depth", @@ -11483,11 +11698,11 @@ "meta-type": "object" }, { - "name": "348", + "name": "352", "members": [ { "name": "addr", - "type": "373" + "type": "377" }, { "name": "logical-block-size", @@ -11503,7 +11718,7 @@ "meta-type": "object" }, { - "name": "349", + "name": "353", "members": [ { "name": "mountpoint", @@ -11517,13 +11732,13 @@ { "name": "allow-other", "default": null, - "type": "584" + "type": "589" } ], "meta-type": "object" }, { - "name": "350", + "name": "354", "members": [ { "name": "name", @@ -11553,7 +11768,7 @@ "meta-type": "object" }, { - "name": "351", + "name": "355", "members": [ { "name": "utf8" @@ -11569,108 +11784,108 @@ ] }, { - "name": "352", + "name": "356", "tag": "type", "variants": [ { "case": "file", - "type": "586" + "type": "591" }, { "case": "serial", - "type": "587" + "type": "592" }, { "case": "parallel", - "type": "587" + "type": "592" }, { "case": "pipe", - "type": "587" + "type": "592" }, { "case": "socket", - "type": "588" + "type": "593" }, { "case": "udp", - "type": "589" + "type": "594" }, { "case": "pty", - "type": "590" + "type": "595" }, { "case": "null", - "type": "590" + "type": "595" }, { "case": "mux", - "type": "591" + "type": "596" }, { "case": "msmouse", - "type": "590" + "type": "595" }, { "case": "wctablet", - "type": "590" + "type": "595" }, { "case": "braille", - "type": "590" + "type": "595" }, { "case": "testdev", - "type": "590" + "type": "595" }, { "case": "stdio", - "type": "592" + "type": "597" }, { "case": "console", - "type": "590" + "type": "595" }, { "case": "spicevmc", - "type": "593" + "type": "598" }, { "case": "spiceport", - "type": "594" + "type": "599" }, { "case": "qemu-vdagent", - "type": "595" + "type": "600" }, { "case": "dbus", - "type": "596" + "type": "601" }, { "case": "vc", - "type": "597" + "type": "602" }, { "case": "ringbuf", - "type": "598" + "type": "603" }, { "case": "memory", - "type": "598" + "type": "603" } ], "members": [ { "name": "type", - "type": "585" + "type": "590" } ], "meta-type": "object" }, { - "name": "353", + "name": "357", "members": [ { "name": "elf" @@ -11698,7 +11913,7 @@ ] }, { - "name": "354", + "name": "358", "members": [ { "name": "none" @@ -11722,12 +11937,12 @@ ] }, { - "name": "[353]", - "element-type": "353", + "name": "[357]", + "element-type": "357", "meta-type": "array" }, { - "name": "355", + "name": "359", "members": [ { "name": "none" @@ -11791,7 +12006,7 @@ ] }, { - "name": "356", + "name": "360", "members": [ { "name": "netdev", @@ -11822,7 +12037,7 @@ "meta-type": "object" }, { - "name": "357", + "name": "361", "members": [ { "name": "hostname", @@ -11882,7 +12097,7 @@ { "name": "dnssearch", "default": null, - "type": "[599]" + "type": "[604]" }, { "name": "domainname", @@ -11922,12 +12137,12 @@ { "name": "hostfwd", "default": null, - "type": "[599]" + "type": "[604]" }, { "name": "guestfwd", "default": null, - "type": "[599]" + "type": "[604]" }, { "name": "tftp-server-name", @@ -11938,7 +12153,7 @@ "meta-type": "object" }, { - "name": "358", + "name": "362", "members": [ { "name": "ifname", @@ -12019,7 +12234,7 @@ "meta-type": "object" }, { - "name": "359", + "name": "363", "members": [ { "name": "src", @@ -12092,7 +12307,7 @@ "meta-type": "object" }, { - "name": "360", + "name": "364", "members": [ { "name": "fd", @@ -12128,11 +12343,11 @@ "meta-type": "object" }, { - "name": "361", + "name": "365", "members": [ { "name": "addr", - "type": "373" + "type": "377" }, { "name": "server", @@ -12148,23 +12363,23 @@ "meta-type": "object" }, { - "name": "362", + "name": "366", "members": [ { "name": "local", "default": null, - "type": "373" + "type": "377" }, { "name": "remote", "default": null, - "type": "373" + "type": "377" } ], "meta-type": "object" }, { - "name": "363", + "name": "367", "members": [ { "name": "sock", @@ -12190,7 +12405,7 @@ "meta-type": "object" }, { - "name": "364", + "name": "368", "members": [ { "name": "br", @@ -12206,7 +12421,7 @@ "meta-type": "object" }, { - "name": "365", + "name": "369", "members": [ { "name": "hubid", @@ -12221,7 +12436,7 @@ "meta-type": "object" }, { - "name": "366", + "name": "370", "members": [ { "name": "ifname", @@ -12236,7 +12451,7 @@ "meta-type": "object" }, { - "name": "367", + "name": "371", "members": [ { "name": "chardev", @@ -12256,7 +12471,7 @@ "meta-type": "object" }, { - "name": "368", + "name": "372", "members": [ { "name": "vhostdev", @@ -12285,7 +12500,7 @@ "meta-type": "object" }, { - "name": "372", + "name": "376", "members": [ { "name": "normal" @@ -12310,36 +12525,36 @@ "meta-type": "array" }, { - "name": "373", + "name": "377", "tag": "type", "variants": [ { "case": "inet", - "type": "561" + "type": "566" }, { "case": "unix", - "type": "600" + "type": "605" }, { "case": "vsock", - "type": "601" + "type": "606" }, { "case": "fd", - "type": "599" + "type": "604" } ], "members": [ { "name": "type", - "type": "579" + "type": "584" } ], "meta-type": "object" }, { - "name": "374", + "name": "378", "members": [ { "name": "half" @@ -12355,7 +12570,7 @@ ] }, { - "name": "375", + "name": "379", "members": [ { "name": "off" @@ -12371,7 +12586,7 @@ ] }, { - "name": "376", + "name": "380", "members": [ { "name": "priority", @@ -12430,7 +12645,7 @@ "meta-type": "object" }, { - "name": "377", + "name": "381", "members": [ { "name": "in-pport", @@ -12471,7 +12686,7 @@ "meta-type": "object" }, { - "name": "378", + "name": "382", "members": [ { "name": "goto-tbl", @@ -12507,16 +12722,16 @@ "meta-type": "object" }, { - "name": "379", + "name": "383", "tag": "type", "variants": [ { "case": "passthrough", - "type": "602" + "type": "607" }, { "case": "emulator", - "type": "603" + "type": "608" } ], "members": [ @@ -12528,7 +12743,7 @@ "meta-type": "object" }, { - "name": "380", + "name": "384", "members": [ { "name": "vnc" @@ -12544,7 +12759,7 @@ ] }, { - "name": "381", + "name": "385", "members": [ { "name": "keep" @@ -12564,7 +12779,7 @@ ] }, { - "name": "382", + "name": "386", "members": [ { "name": "display", @@ -12575,7 +12790,7 @@ "meta-type": "object" }, { - "name": "383", + "name": "387", "members": [ { "name": "display", @@ -12586,7 +12801,7 @@ "meta-type": "object" }, { - "name": "384", + "name": "388", "members": [ { "name": "ppm" @@ -12602,7 +12817,7 @@ ] }, { - "name": "385", + "name": "389", "members": [ { "name": "client" @@ -12622,12 +12837,12 @@ ] }, { - "name": "[386]", - "element-type": "386", + "name": "[390]", + "element-type": "390", "meta-type": "array" }, { - "name": "386", + "name": "390", "members": [ { "name": "host", @@ -12639,7 +12854,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "connection-id", @@ -12661,7 +12876,7 @@ "meta-type": "object" }, { - "name": "387", + "name": "391", "members": [ { "name": "host", @@ -12673,13 +12888,13 @@ }, { "name": "family", - "type": "389" + "type": "393" } ], "meta-type": "object" }, { - "name": "388", + "name": "392", "members": [ { "name": "host", @@ -12691,7 +12906,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "auth", @@ -12702,7 +12917,7 @@ "meta-type": "object" }, { - "name": "389", + "name": "393", "members": [ { "name": "ipv4" @@ -12730,12 +12945,12 @@ ] }, { - "name": "[390]", - "element-type": "390", + "name": "[394]", + "element-type": "394", "meta-type": "array" }, { - "name": "390", + "name": "394", "members": [ { "name": "host", @@ -12747,7 +12962,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "websocket", @@ -12767,12 +12982,12 @@ "meta-type": "object" }, { - "name": "[391]", - "element-type": "391", + "name": "[395]", + "element-type": "395", "meta-type": "array" }, { - "name": "391", + "name": "395", "members": [ { "name": "host", @@ -12784,7 +12999,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "websocket", @@ -12792,18 +13007,18 @@ }, { "name": "auth", - "type": "392" + "type": "396" }, { "name": "vencrypt", "default": null, - "type": "393" + "type": "397" } ], "meta-type": "object" }, { - "name": "392", + "name": "396", "members": [ { "name": "none" @@ -12847,7 +13062,7 @@ ] }, { - "name": "393", + "name": "397", "members": [ { "name": "plain" @@ -12891,7 +13106,7 @@ ] }, { - "name": "394", + "name": "398", "members": [ { "name": "host", @@ -12903,7 +13118,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "websocket", @@ -12918,7 +13133,7 @@ "meta-type": "object" }, { - "name": "395", + "name": "399", "members": [ { "name": "host", @@ -12930,7 +13145,7 @@ }, { "name": "family", - "type": "389" + "type": "393" }, { "name": "websocket", @@ -12940,71 +13155,71 @@ "meta-type": "object" }, { - "name": "[396]", - "element-type": "396", + "name": "[400]", + "element-type": "400", "meta-type": "array" }, { - "name": "396", + "name": "400", "tag": "type", "variants": [ { "case": "number", - "type": "605" + "type": "610" }, { "case": "qcode", - "type": "606" + "type": "611" } ], "members": [ { "name": "type", - "type": "604" + "type": "609" } ], "meta-type": "object" }, { - "name": "[397]", - "element-type": "397", + "name": "[401]", + "element-type": "401", "meta-type": "array" }, { - "name": "397", + "name": "401", "tag": "type", "variants": [ { "case": "key", - "type": "608" + "type": "613" }, { "case": "btn", - "type": "609" + "type": "614" }, { "case": "rel", - "type": "610" + "type": "615" }, { "case": "abs", - "type": "610" + "type": "615" }, { "case": "mtt", - "type": "611" + "type": "616" } ], "members": [ { "name": "type", - "type": "607" + "type": "612" } ], "meta-type": "object" }, { - "name": "398", + "name": "402", "members": [ { "name": "default" @@ -13040,7 +13255,7 @@ ] }, { - "name": "399", + "name": "403", "members": [ { "name": "off" @@ -13064,7 +13279,7 @@ ] }, { - "name": "400", + "name": "404", "members": [ { "name": "grab-on-hover", @@ -13090,7 +13305,7 @@ "meta-type": "object" }, { - "name": "401", + "name": "405", "members": [ { "name": "left-command-key", @@ -13111,7 +13326,7 @@ "meta-type": "object" }, { - "name": "402", + "name": "406", "members": [ { "name": "charset", @@ -13122,7 +13337,7 @@ "meta-type": "object" }, { - "name": "403", + "name": "407", "members": [ { "name": "rendernode", @@ -13133,7 +13348,7 @@ "meta-type": "object" }, { - "name": "404", + "name": "408", "members": [ { "name": "rendernode", @@ -13159,18 +13374,18 @@ "meta-type": "object" }, { - "name": "405", + "name": "409", "members": [ { "name": "grab-mod", "default": null, - "type": "612" + "type": "617" } ], "meta-type": "object" }, { - "name": "406", + "name": "410", "members": [ { "name": "vnc" @@ -13182,7 +13397,7 @@ ] }, { - "name": "407", + "name": "411", "members": [ { "name": "tls-certs", @@ -13193,7 +13408,7 @@ "meta-type": "object" }, { - "name": "408", + "name": "412", "members": [ { "name": "vnc" @@ -13205,18 +13420,18 @@ ] }, { - "name": "409", + "name": "413", "members": [ { "name": "addresses", "default": null, - "type": "[373]" + "type": "[377]" } ], "meta-type": "object" }, { - "name": "410", + "name": "414", "members": [ { "name": "none" @@ -13280,7 +13495,7 @@ ] }, { - "name": "411", + "name": "415", "members": [ { "name": "transferred", @@ -13358,7 +13573,7 @@ "meta-type": "object" }, { - "name": "412", + "name": "416", "members": [ { "name": "transferred", @@ -13368,7 +13583,7 @@ "meta-type": "object" }, { - "name": "413", + "name": "417", "members": [ { "name": "cache-size", @@ -13402,7 +13617,7 @@ "meta-type": "object" }, { - "name": "414", + "name": "418", "members": [ { "name": "pages", @@ -13428,12 +13643,12 @@ "meta-type": "object" }, { - "name": "[373]", - "element-type": "373", + "name": "[377]", + "element-type": "377", "meta-type": "array" }, { - "name": "415", + "name": "419", "members": [ { "name": "xbzrle" @@ -13503,6 +13718,9 @@ }, { "name": "postcopy-preempt" + }, + { + "name": "switchover-ack" } ], "meta-type": "enum", @@ -13527,11 +13745,12 @@ "validate-uuid", "background-snapshot", "zero-copy-send", - "postcopy-preempt" + "postcopy-preempt", + "switchover-ack" ] }, { - "name": "416", + "name": "420", "members": [ { "name": "none" @@ -13551,12 +13770,12 @@ ] }, { - "name": "[417]", - "element-type": "417", + "name": "[421]", + "element-type": "421", "meta-type": "array" }, { - "name": "417", + "name": "421", "members": [ { "name": "node-name", @@ -13568,13 +13787,13 @@ }, { "name": "bitmaps", - "type": "[613]" + "type": "[618]" } ], "meta-type": "object" }, { - "name": "418", + "name": "422", "members": [ { "name": "none" @@ -13594,7 +13813,7 @@ ] }, { - "name": "419", + "name": "423", "members": [ { "name": "none" @@ -13618,7 +13837,7 @@ ] }, { - "name": "420", + "name": "424", "members": [ { "name": "page-sampling" @@ -13638,7 +13857,7 @@ ] }, { - "name": "421", + "name": "425", "members": [ { "name": "unstarted" @@ -13658,12 +13877,12 @@ ] }, { - "name": "[422]", - "element-type": "422", + "name": "[426]", + "element-type": "426", "meta-type": "array" }, { - "name": "422", + "name": "426", "members": [ { "name": "id", @@ -13677,84 +13896,84 @@ "meta-type": "object" }, { - "name": "[423]", - "element-type": "423", + "name": "[427]", + "element-type": "427", "meta-type": "array" }, { - "name": "423", + "name": "427", "tag": "type", "variants": [ { "case": "abort", - "type": "615" + "type": "620" }, { "case": "block-dirty-bitmap-add", - "type": "616" + "type": "621" }, { "case": "block-dirty-bitmap-remove", - "type": "617" + "type": "622" }, { "case": "block-dirty-bitmap-clear", - "type": "617" + "type": "622" }, { "case": "block-dirty-bitmap-enable", - "type": "617" + "type": "622" }, { "case": "block-dirty-bitmap-disable", - "type": "617" + "type": "622" }, { "case": "block-dirty-bitmap-merge", - "type": "618" + "type": "623" }, { "case": "blockdev-backup", - "type": "619" + "type": "624" }, { "case": "blockdev-snapshot", - "type": "620" + "type": "625" }, { "case": "blockdev-snapshot-internal-sync", - "type": "621" + "type": "626" }, { "case": "blockdev-snapshot-sync", - "type": "622" + "type": "627" }, { "case": "drive-backup", - "type": "623" + "type": "628" } ], "members": [ { "name": "type", - "type": "614" + "type": "619" } ], "meta-type": "object" }, { - "name": "424", + "name": "428", "members": [ { "name": "completion-mode", "default": null, - "type": "624" + "type": "629" } ], "meta-type": "object" }, { - "name": "425", + "name": "429", "members": [ { "name": "unavailable" @@ -13774,12 +13993,12 @@ ] }, { - "name": "[426]", - "element-type": "426", + "name": "[430]", + "element-type": "430", "meta-type": "array" }, { - "name": "426", + "name": "430", "members": [ { "name": "oob" @@ -13791,7 +14010,7 @@ ] }, { - "name": "427", + "name": "431", "members": [ { "name": "major", @@ -13809,7 +14028,7 @@ "meta-type": "object" }, { - "name": "428", + "name": "432", "members": [ { "name": "builtin" @@ -13845,21 +14064,21 @@ ] }, { - "name": "429", + "name": "433", "members": [ { "name": "json-type", - "type": "625" + "type": "630" } ], "meta-type": "object" }, { - "name": "430", + "name": "434", "members": [ { "name": "members", - "type": "[626]" + "type": "[631]" }, { "name": "values", @@ -13872,7 +14091,7 @@ "meta-type": "object" }, { - "name": "431", + "name": "435", "members": [ { "name": "element-type", @@ -13882,11 +14101,11 @@ "meta-type": "object" }, { - "name": "432", + "name": "436", "members": [ { "name": "members", - "type": "[627]" + "type": "[632]" }, { "name": "tag", @@ -13896,23 +14115,23 @@ { "name": "variants", "default": null, - "type": "[628]" + "type": "[633]" } ], "meta-type": "object" }, { - "name": "433", + "name": "437", "members": [ { "name": "members", - "type": "[629]" + "type": "[634]" } ], "meta-type": "object" }, { - "name": "434", + "name": "438", "members": [ { "name": "arg-type", @@ -13931,7 +14150,7 @@ "meta-type": "object" }, { - "name": "435", + "name": "439", "members": [ { "name": "arg-type", @@ -13941,7 +14160,7 @@ "meta-type": "object" }, { - "name": "436", + "name": "440", "members": [ { "name": "authz-list" @@ -14131,23 +14350,23 @@ ] }, { - "name": "437", + "name": "441", "members": [ { "name": "policy", "default": null, - "type": "630" + "type": "635" }, { "name": "rules", "default": null, - "type": "[631]" + "type": "[636]" } ], "meta-type": "object" }, { - "name": "438", + "name": "442", "members": [ { "name": "filename", @@ -14162,7 +14381,7 @@ "meta-type": "object" }, { - "name": "439", + "name": "443", "members": [ { "name": "service", @@ -14172,7 +14391,7 @@ "meta-type": "object" }, { - "name": "440", + "name": "444", "members": [ { "name": "identity", @@ -14182,7 +14401,7 @@ "meta-type": "object" }, { - "name": "441", + "name": "445", "members": [ { "name": "if", @@ -14196,7 +14415,7 @@ "meta-type": "object" }, { - "name": "442", + "name": "446", "members": [ { "name": "primary_in", @@ -14243,7 +14462,7 @@ "meta-type": "object" }, { - "name": "443", + "name": "447", "members": [ { "name": "queues", @@ -14264,7 +14483,7 @@ "meta-type": "object" }, { - "name": "444", + "name": "448", "members": [ { "name": "queues", @@ -14289,7 +14508,7 @@ "meta-type": "object" }, { - "name": "445", + "name": "449", "members": [ { "name": "addr", @@ -14304,7 +14523,7 @@ "meta-type": "object" }, { - "name": "446", + "name": "450", "members": [ { "name": "netdev", @@ -14313,7 +14532,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14328,7 +14547,7 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" }, { "name": "interval", @@ -14338,7 +14557,7 @@ "meta-type": "object" }, { - "name": "447", + "name": "451", "members": [ { "name": "netdev", @@ -14347,7 +14566,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14362,7 +14581,7 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" }, { "name": "file", @@ -14377,7 +14596,7 @@ "meta-type": "object" }, { - "name": "448", + "name": "452", "members": [ { "name": "netdev", @@ -14386,7 +14605,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14401,7 +14620,7 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" }, { "name": "outdev", @@ -14416,7 +14635,7 @@ "meta-type": "object" }, { - "name": "449", + "name": "453", "members": [ { "name": "netdev", @@ -14425,7 +14644,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14440,7 +14659,7 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" }, { "name": "indev", @@ -14461,7 +14680,7 @@ "meta-type": "object" }, { - "name": "450", + "name": "454", "members": [ { "name": "netdev", @@ -14470,7 +14689,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14485,13 +14704,13 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" } ], "meta-type": "object" }, { - "name": "451", + "name": "455", "members": [ { "name": "netdev", @@ -14500,7 +14719,7 @@ { "name": "queue", "default": null, - "type": "632" + "type": "637" }, { "name": "status", @@ -14515,7 +14734,7 @@ { "name": "insert", "default": null, - "type": "633" + "type": "638" }, { "name": "vnet_hdr_support", @@ -14526,7 +14745,7 @@ "meta-type": "object" }, { - "name": "452", + "name": "456", "members": [ { "name": "name", @@ -14566,7 +14785,7 @@ "meta-type": "object" }, { - "name": "453", + "name": "457", "members": [ { "name": "evdev", @@ -14585,13 +14804,13 @@ { "name": "grab-toggle", "default": null, - "type": "634" + "type": "639" } ], "meta-type": "object" }, { - "name": "454", + "name": "458", "members": [ { "name": "aio-max-batch", @@ -14627,7 +14846,7 @@ "meta-type": "object" }, { - "name": "455", + "name": "459", "members": [ { "name": "aio-max-batch", @@ -14648,7 +14867,7 @@ "meta-type": "object" }, { - "name": "456", + "name": "460", "members": [ { "name": "dump", @@ -14668,7 +14887,7 @@ { "name": "policy", "default": null, - "type": "479" + "type": "483" }, { "name": "prealloc", @@ -14708,7 +14927,7 @@ "meta-type": "object" }, { - "name": "457", + "name": "461", "members": [ { "name": "dump", @@ -14728,7 +14947,7 @@ { "name": "policy", "default": null, - "type": "479" + "type": "483" }, { "name": "prealloc", @@ -14797,7 +15016,7 @@ "meta-type": "object" }, { - "name": "458", + "name": "462", "members": [ { "name": "dump", @@ -14817,7 +15036,7 @@ { "name": "policy", "default": null, - "type": "479" + "type": "483" }, { "name": "prealloc", @@ -14872,7 +15091,7 @@ "meta-type": "object" }, { - "name": "459", + "name": "463", "members": [ { "name": "dump", @@ -14892,7 +15111,7 @@ { "name": "policy", "default": null, - "type": "479" + "type": "483" }, { "name": "prealloc", @@ -14932,7 +15151,7 @@ "meta-type": "object" }, { - "name": "460", + "name": "464", "members": [ { "name": "path", @@ -14942,7 +15161,7 @@ "meta-type": "object" }, { - "name": "461", + "name": "465", "members": [ { "name": "chardev", @@ -14957,7 +15176,7 @@ "meta-type": "object" }, { - "name": "462", + "name": "466", "members": [ { "name": "opened", @@ -14971,7 +15190,7 @@ "meta-type": "object" }, { - "name": "463", + "name": "467", "members": [ { "name": "opened", @@ -14989,7 +15208,7 @@ "meta-type": "object" }, { - "name": "464", + "name": "468", "members": [ { "name": "opened", @@ -15008,7 +15227,7 @@ "meta-type": "object" }, { - "name": "465", + "name": "469", "members": [ { "name": "loaded", @@ -15021,7 +15240,7 @@ { "name": "format", "default": null, - "type": "635" + "type": "640" }, { "name": "keyid", @@ -15047,7 +15266,7 @@ "meta-type": "object" }, { - "name": "466", + "name": "470", "members": [ { "name": "loaded", @@ -15060,7 +15279,7 @@ { "name": "format", "default": null, - "type": "635" + "type": "640" }, { "name": "keyid", @@ -15080,7 +15299,7 @@ "meta-type": "object" }, { - "name": "467", + "name": "471", "members": [ { "name": "sev-device", @@ -15125,7 +15344,7 @@ "meta-type": "object" }, { - "name": "468", + "name": "472", "members": [ { "name": "cpu-affinity", @@ -15141,12 +15360,12 @@ "meta-type": "object" }, { - "name": "469", + "name": "473", "members": [ { "name": "limits", "default": null, - "type": "636" + "type": "641" }, { "name": "x-iops-total", @@ -15304,7 +15523,7 @@ "meta-type": "object" }, { - "name": "470", + "name": "474", "members": [ { "name": "verify-peer", @@ -15319,7 +15538,7 @@ { "name": "endpoint", "default": null, - "type": "637" + "type": "642" }, { "name": "priority", @@ -15338,7 +15557,7 @@ "meta-type": "object" }, { - "name": "471", + "name": "475", "members": [ { "name": "verify-peer", @@ -15353,7 +15572,7 @@ { "name": "endpoint", "default": null, - "type": "637" + "type": "642" }, { "name": "priority", @@ -15377,7 +15596,7 @@ "meta-type": "object" }, { - "name": "472", + "name": "476", "members": [ { "name": "verify-peer", @@ -15392,7 +15611,7 @@ { "name": "endpoint", "default": null, - "type": "637" + "type": "642" }, { "name": "priority", @@ -15421,7 +15640,7 @@ "meta-type": "object" }, { - "name": "473", + "name": "477", "members": [ { "name": "verify-peer", @@ -15436,7 +15655,7 @@ { "name": "endpoint", "default": null, - "type": "637" + "type": "642" }, { "name": "priority", @@ -15447,7 +15666,7 @@ "meta-type": "object" }, { - "name": "474", + "name": "478", "members": [ { "name": "fd", @@ -15461,11 +15680,11 @@ "meta-type": "object" }, { - "name": "475", + "name": "479", "members": [ { "name": "socket", - "type": "373" + "type": "377" }, { "name": "device", @@ -15475,7 +15694,7 @@ "meta-type": "object" }, { - "name": "476", + "name": "480", "members": [ { "name": "node-id", @@ -15511,7 +15730,7 @@ "meta-type": "object" }, { - "name": "477", + "name": "481", "members": [ { "name": "aarch64" @@ -15643,17 +15862,17 @@ ] }, { - "name": "478", + "name": "482", "members": [ { "name": "cpu-state", - "type": "638" + "type": "643" } ], "meta-type": "object" }, { - "name": "479", + "name": "483", "members": [ { "name": "default" @@ -15677,7 +15896,7 @@ ] }, { - "name": "480", + "name": "484", "members": [ { "name": "node" @@ -15705,7 +15924,7 @@ ] }, { - "name": "481", + "name": "485", "members": [ { "name": "nodeid", @@ -15736,7 +15955,7 @@ "meta-type": "object" }, { - "name": "482", + "name": "486", "members": [ { "name": "src", @@ -15754,7 +15973,7 @@ "meta-type": "object" }, { - "name": "483", + "name": "487", "members": [ { "name": "node-id", @@ -15790,7 +16009,7 @@ "meta-type": "object" }, { - "name": "484", + "name": "488", "members": [ { "name": "initiator", @@ -15802,11 +16021,11 @@ }, { "name": "hierarchy", - "type": "639" + "type": "644" }, { "name": "data-type", - "type": "640" + "type": "645" }, { "name": "latency", @@ -15822,7 +16041,7 @@ "meta-type": "object" }, { - "name": "485", + "name": "489", "members": [ { "name": "node-id", @@ -15838,11 +16057,11 @@ }, { "name": "associativity", - "type": "641" + "type": "646" }, { "name": "policy", - "type": "642" + "type": "647" }, { "name": "line", @@ -15852,7 +16071,7 @@ "meta-type": "object" }, { - "name": "486", + "name": "490", "members": [ { "name": "dimm" @@ -15880,47 +16099,47 @@ ] }, { - "name": "487", + "name": "491", "members": [ { "name": "data", - "type": "643" + "type": "648" } ], "meta-type": "object" }, { - "name": "488", + "name": "492", "members": [ { "name": "data", - "type": "644" + "type": "649" } ], "meta-type": "object" }, { - "name": "489", + "name": "493", "members": [ { "name": "data", - "type": "645" + "type": "650" } ], "meta-type": "object" }, { - "name": "490", + "name": "494", "members": [ { "name": "data", - "type": "646" + "type": "651" } ], "meta-type": "object" }, { - "name": "491", + "name": "495", "members": [ { "name": "name", @@ -15935,7 +16154,7 @@ "meta-type": "object" }, { - "name": "492", + "name": "496", "members": [ { "name": "incompatible" @@ -15959,7 +16178,7 @@ ] }, { - "name": "493", + "name": "497", "members": [ { "name": "static" @@ -15975,7 +16194,7 @@ ] }, { - "name": "494", + "name": "498", "members": [ { "name": "none" @@ -15995,7 +16214,7 @@ ] }, { - "name": "495", + "name": "499", "members": [ { "name": "block-node" @@ -16015,7 +16234,7 @@ ] }, { - "name": "496", + "name": "500", "members": [ { "name": "node-name", @@ -16025,7 +16244,7 @@ "meta-type": "object" }, { - "name": "497", + "name": "501", "members": [ { "name": "id", @@ -16035,12 +16254,12 @@ "meta-type": "object" }, { - "name": "[498]", - "element-type": "498", + "name": "[502]", + "element-type": "502", "meta-type": "array" }, { - "name": "498", + "name": "502", "members": [ { "name": "fd", @@ -16055,12 +16274,12 @@ "meta-type": "object" }, { - "name": "[499]", - "element-type": "499", + "name": "[503]", + "element-type": "503", "meta-type": "array" }, { - "name": "499", + "name": "503", "members": [ { "name": "name", @@ -16068,7 +16287,7 @@ }, { "name": "type", - "type": "647" + "type": "652" }, { "name": "help", @@ -16084,7 +16303,7 @@ "meta-type": "object" }, { - "name": "500", + "name": "504", "members": [ { "name": "uninit" @@ -16116,12 +16335,12 @@ ] }, { - "name": "[501]", - "element-type": "501", + "name": "[505]", + "element-type": "505", "meta-type": "array" }, { - "name": "501", + "name": "505", "members": [ { "name": "node", @@ -16135,7 +16354,7 @@ "meta-type": "object" }, { - "name": "502", + "name": "506", "members": [ { "name": "closed" @@ -16167,7 +16386,7 @@ ] }, { - "name": "503", + "name": "507", "members": [ { "name": "none" @@ -16207,33 +16426,33 @@ ] }, { - "name": "504", + "name": "508", "members": [ { "name": "in", "default": null, - "type": "648" + "type": "653" }, { "name": "out", "default": null, - "type": "648" + "type": "653" } ], "meta-type": "object" }, { - "name": "505", + "name": "509", "members": [ { "name": "in", "default": null, - "type": "649" + "type": "654" }, { "name": "out", "default": null, - "type": "649" + "type": "654" }, { "name": "threshold", @@ -16244,33 +16463,33 @@ "meta-type": "object" }, { - "name": "506", + "name": "510", "members": [ { "name": "in", "default": null, - "type": "650" + "type": "655" }, { "name": "out", "default": null, - "type": "650" + "type": "655" } ], "meta-type": "object" }, { - "name": "507", + "name": "511", "members": [ { "name": "in", "default": null, - "type": "648" + "type": "653" }, { "name": "out", "default": null, - "type": "648" + "type": "653" }, { "name": "latency", @@ -16281,33 +16500,33 @@ "meta-type": "object" }, { - "name": "508", + "name": "512", "members": [ { "name": "in", "default": null, - "type": "651" + "type": "656" }, { "name": "out", "default": null, - "type": "651" + "type": "656" } ], "meta-type": "object" }, { - "name": "509", + "name": "513", "members": [ { "name": "in", "default": null, - "type": "652" + "type": "657" }, { "name": "out", "default": null, - "type": "652" + "type": "657" }, { "name": "try-mmap", @@ -16328,17 +16547,17 @@ "meta-type": "object" }, { - "name": "510", + "name": "514", "members": [ { "name": "in", "default": null, - "type": "653" + "type": "658" }, { "name": "out", "default": null, - "type": "653" + "type": "658" }, { "name": "server", @@ -16349,49 +16568,49 @@ "meta-type": "object" }, { - "name": "511", + "name": "515", "members": [ { "name": "in", "default": null, - "type": "654" + "type": "659" }, { "name": "out", "default": null, - "type": "654" + "type": "659" } ], "meta-type": "object" }, { - "name": "512", + "name": "516", "members": [ { "name": "in", "default": null, - "type": "655" + "type": "660" }, { "name": "out", "default": null, - "type": "655" + "type": "660" } ], "meta-type": "object" }, { - "name": "513", + "name": "517", "members": [ { "name": "in", "default": null, - "type": "648" + "type": "653" }, { "name": "out", "default": null, - "type": "648" + "type": "653" }, { "name": "dev", @@ -16407,17 +16626,17 @@ "meta-type": "object" }, { - "name": "514", + "name": "518", "members": [ { "name": "in", "default": null, - "type": "648" + "type": "653" }, { "name": "out", "default": null, - "type": "648" + "type": "653" }, { "name": "path", @@ -16428,7 +16647,7 @@ "meta-type": "object" }, { - "name": "515", + "name": "519", "members": [ { "name": "DIMM" @@ -16444,12 +16663,12 @@ ] }, { - "name": "[516]", - "element-type": "516", + "name": "[520]", + "element-type": "520", "meta-type": "array" }, { - "name": "516", + "name": "520", "members": [ { "name": "bus", @@ -16465,11 +16684,11 @@ }, { "name": "class_info", - "type": "656" + "type": "661" }, { "name": "id", - "type": "657" + "type": "662" }, { "name": "irq", @@ -16487,17 +16706,17 @@ { "name": "pci_bridge", "default": null, - "type": "658" + "type": "663" }, { "name": "regions", - "type": "[659]" + "type": "[664]" } ], "meta-type": "object" }, { - "name": "517", + "name": "521", "members": [ { "name": "vm" @@ -16517,16 +16736,16 @@ ] }, { - "name": "[518]", - "element-type": "518", + "name": "[522]", + "element-type": "522", "meta-type": "array" }, { - "name": "518", + "name": "522", "members": [ { "name": "provider", - "type": "520" + "type": "524" }, { "name": "names", @@ -16537,7 +16756,7 @@ "meta-type": "object" }, { - "name": "519", + "name": "523", "members": [ { "name": "vcpus", @@ -16548,7 +16767,7 @@ "meta-type": "object" }, { - "name": "520", + "name": "524", "members": [ { "name": "kvm" @@ -16564,12 +16783,12 @@ ] }, { - "name": "[521]", - "element-type": "521", + "name": "[525]", + "element-type": "525", "meta-type": "array" }, { - "name": "521", + "name": "525", "members": [ { "name": "name", @@ -16577,18 +16796,18 @@ }, { "name": "value", - "type": "660" + "type": "665" } ], "meta-type": "object" }, { - "name": "[522]", - "element-type": "522", + "name": "[526]", + "element-type": "526", "meta-type": "array" }, { - "name": "522", + "name": "526", "members": [ { "name": "name", @@ -16596,12 +16815,12 @@ }, { "name": "type", - "type": "661" + "type": "666" }, { "name": "unit", "default": null, - "type": "662" + "type": "667" }, { "name": "base", @@ -16621,7 +16840,7 @@ "meta-type": "object" }, { - "name": "523", + "name": "527", "members": [ { "name": "transports", @@ -16641,7 +16860,7 @@ "meta-type": "object" }, { - "name": "524", + "name": "528", "members": [ { "name": "statuses", @@ -16656,7 +16875,7 @@ "meta-type": "object" }, { - "name": "525", + "name": "529", "members": [ { "name": "n-mem-sections", @@ -16676,19 +16895,19 @@ }, { "name": "features", - "type": "523" + "type": "527" }, { "name": "acked-features", - "type": "523" + "type": "527" }, { "name": "backend-features", - "type": "523" + "type": "527" }, { "name": "protocol-features", - "type": "663" + "type": "668" }, { "name": "max-queues", @@ -16710,12 +16929,12 @@ "meta-type": "object" }, { - "name": "[526]", - "element-type": "526", + "name": "[530]", + "element-type": "530", "meta-type": "array" }, { - "name": "526", + "name": "530", "members": [ { "name": "addr", @@ -16733,7 +16952,7 @@ "meta-type": "object" }, { - "name": "527", + "name": "531", "members": [ { "name": "flags", @@ -16751,7 +16970,7 @@ "meta-type": "object" }, { - "name": "528", + "name": "532", "members": [ { "name": "flags", @@ -16765,12 +16984,12 @@ "meta-type": "object" }, { - "name": "[529]", - "element-type": "529", + "name": "[533]", + "element-type": "533", "meta-type": "array" }, { - "name": "529", + "name": "533", "members": [ { "name": "cipher" @@ -16798,12 +17017,12 @@ ] }, { - "name": "[530]", - "element-type": "530", + "name": "[534]", + "element-type": "534", "meta-type": "array" }, { - "name": "530", + "name": "534", "members": [ { "name": "queue", @@ -16811,22 +17030,46 @@ }, { "name": "type", - "type": "664" + "type": "669" } ], "meta-type": "object" }, { - "name": "[531]", - "element-type": "531", + "name": "535", + "members": [ + { + "name": "informational" + }, + { + "name": "warning" + }, + { + "name": "failure" + }, + { + "name": "fatal" + } + ], + "meta-type": "enum", + "values": [ + "informational", + "warning", + "failure", + "fatal" + ] + }, + { + "name": "[536]", + "element-type": "536", "meta-type": "array" }, { - "name": "531", + "name": "536", "members": [ { "name": "type", - "type": "665" + "type": "670" }, { "name": "header", @@ -16836,7 +17079,7 @@ "meta-type": "object" }, { - "name": "532", + "name": "537", "members": [ { "name": "cache-data-ecc" @@ -16872,7 +17115,7 @@ ] }, { - "name": "533", + "name": "538", "members": [ { "name": "hyper-v" @@ -16888,7 +17131,7 @@ ] }, { - "name": "534", + "name": "539", "members": [ { "name": "arg1", @@ -16914,7 +17157,7 @@ "meta-type": "object" }, { - "name": "535", + "name": "540", "members": [ { "name": "core", @@ -16930,18 +17173,18 @@ }, { "name": "reason", - "type": "666" + "type": "671" } ], "meta-type": "object" }, { - "name": "[536]", - "element-type": "536", + "name": "[541]", + "element-type": "541", "meta-type": "array" }, { - "name": "536", + "name": "541", "members": [ { "name": "interval_length", @@ -17011,7 +17254,7 @@ "meta-type": "object" }, { - "name": "537", + "name": "542", "members": [ { "name": "boundaries", @@ -17025,7 +17268,7 @@ "meta-type": "object" }, { - "name": "538", + "name": "543", "members": [ { "name": "discard-nb-ok", @@ -17043,7 +17286,7 @@ "meta-type": "object" }, { - "name": "539", + "name": "544", "members": [ { "name": "completion-errors", @@ -17066,40 +17309,40 @@ "meta-type": "array" }, { - "name": "540", + "name": "545", "tag": "type", "variants": [ { "case": "qcow2", - "type": "668" + "type": "673" }, { "case": "vmdk", - "type": "669" + "type": "674" }, { "case": "luks", - "type": "670" + "type": "675" }, { "case": "rbd", - "type": "671" + "type": "676" }, { "case": "file", - "type": "672" + "type": "677" } ], "members": [ { "name": "type", - "type": "667" + "type": "672" } ], "meta-type": "object" }, { - "name": "541", + "name": "546", "members": [ { "name": "block-backend" @@ -17119,12 +17362,12 @@ ] }, { - "name": "[542]", - "element-type": "542", + "name": "[547]", + "element-type": "547", "meta-type": "array" }, { - "name": "542", + "name": "547", "members": [ { "name": "consistent-read" @@ -17148,7 +17391,7 @@ ] }, { - "name": "543", + "name": "548", "members": [ { "type": "57" @@ -17160,16 +17403,16 @@ "meta-type": "alternate" }, { - "name": "[544]", - "element-type": "544", + "name": "[549]", + "element-type": "549", "meta-type": "array" }, { - "name": "544", + "name": "549", "members": [ { "name": "event", - "type": "673" + "type": "678" }, { "name": "state", @@ -17179,7 +17422,7 @@ { "name": "iotype", "default": null, - "type": "674" + "type": "679" }, { "name": "errno", @@ -17205,16 +17448,16 @@ "meta-type": "object" }, { - "name": "[545]", - "element-type": "545", + "name": "[550]", + "element-type": "550", "meta-type": "array" }, { - "name": "545", + "name": "550", "members": [ { "name": "event", - "type": "673" + "type": "678" }, { "name": "state", @@ -17229,7 +17472,7 @@ "meta-type": "object" }, { - "name": "546", + "name": "551", "members": [ { "name": "break-guest-write" @@ -17245,7 +17488,7 @@ ] }, { - "name": "547", + "name": "552", "members": [ { "name": "auto" @@ -17265,7 +17508,7 @@ ] }, { - "name": "548", + "name": "553", "members": [ { "name": "threads" @@ -17285,7 +17528,7 @@ ] }, { - "name": "549", + "name": "554", "members": [ { "name": "tcp" @@ -17301,7 +17544,7 @@ ] }, { - "name": "550", + "name": "555", "members": [ { "name": "crc32c" @@ -17325,11 +17568,11 @@ ] }, { - "name": "551", + "name": "556", "members": [ { "name": "type", - "type": "675" + "type": "680" }, { "name": "host", @@ -17339,7 +17582,7 @@ "meta-type": "object" }, { - "name": "552", + "name": "557", "members": [ { "type": "57" @@ -17354,62 +17597,62 @@ "meta-type": "alternate" }, { - "name": "553", + "name": "558", "members": [ { - "type": "676" + "type": "681" }, { - "type": "677" + "type": "682" } ], "meta-type": "alternate" }, { - "name": "554", + "name": "559", "tag": "format", "variants": [ { "case": "aes", - "type": "679" + "type": "684" }, { "case": "luks", - "type": "680" + "type": "685" } ], "members": [ { "name": "format", - "type": "678" + "type": "683" } ], "meta-type": "object" }, { - "name": "555", + "name": "560", "tag": "format", "variants": [ { "case": "aes", - "type": "679" + "type": "684" } ], "members": [ { "name": "format", - "type": "681" + "type": "686" } ], "meta-type": "object" }, { - "name": "[543]", - "element-type": "543", + "name": "[548]", + "element-type": "548", "meta-type": "array" }, { - "name": "556", + "name": "561", "members": [ { "name": "quorum" @@ -17425,42 +17668,42 @@ ] }, { - "name": "557", + "name": "562", "tag": "format", "variants": [ { "case": "luks", - "type": "683" + "type": "688" }, { "case": "luks2", - "type": "684" + "type": "689" }, { "case": "luks-any", - "type": "685" + "type": "690" } ], "members": [ { "name": "format", - "type": "682" + "type": "687" }, { "name": "parent", "default": null, - "type": "557" + "type": "562" } ], "meta-type": "object" }, { - "name": "[558]", - "element-type": "558", + "name": "[563]", + "element-type": "563", "meta-type": "array" }, { - "name": "558", + "name": "563", "members": [ { "name": "cephx" @@ -17476,12 +17719,12 @@ ] }, { - "name": "[559]", - "element-type": "559", + "name": "[564]", + "element-type": "564", "meta-type": "array" }, { - "name": "559", + "name": "564", "members": [ { "name": "host", @@ -17495,7 +17738,7 @@ "meta-type": "object" }, { - "name": "560", + "name": "565", "members": [ { "name": "primary" @@ -17511,7 +17754,7 @@ ] }, { - "name": "561", + "name": "566", "members": [ { "name": "host", @@ -17555,12 +17798,12 @@ "meta-type": "object" }, { - "name": "562", + "name": "567", "tag": "mode", "variants": [ { "case": "hash", - "type": "687" + "type": "692" }, { "case": "none", @@ -17574,13 +17817,13 @@ "members": [ { "name": "mode", - "type": "686" + "type": "691" } ], "meta-type": "object" }, { - "name": "563", + "name": "568", "members": [ { "name": "filename", @@ -17593,7 +17836,7 @@ { "name": "preallocation", "default": null, - "type": "688" + "type": "693" }, { "name": "nocow", @@ -17609,11 +17852,11 @@ "meta-type": "object" }, { - "name": "564", + "name": "569", "members": [ { "name": "location", - "type": "313" + "type": "317" }, { "name": "size", @@ -17622,13 +17865,13 @@ { "name": "preallocation", "default": null, - "type": "688" + "type": "693" } ], "meta-type": "object" }, { - "name": "565", + "name": "570", "members": [ { "name": "key-secret", @@ -17638,27 +17881,27 @@ { "name": "cipher-alg", "default": null, - "type": "689" + "type": "694" }, { "name": "cipher-mode", "default": null, - "type": "690" + "type": "695" }, { "name": "ivgen-alg", "default": null, - "type": "691" + "type": "696" }, { "name": "ivgen-hash-alg", "default": null, - "type": "692" + "type": "697" }, { "name": "hash-alg", "default": null, - "type": "692" + "type": "697" }, { "name": "iter-time", @@ -17667,7 +17910,7 @@ }, { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17676,17 +17919,17 @@ { "name": "preallocation", "default": null, - "type": "688" + "type": "693" } ], "meta-type": "object" }, { - "name": "566", + "name": "571", "members": [ { "name": "location", - "type": "320" + "type": "324" }, { "name": "size", @@ -17696,11 +17939,11 @@ "meta-type": "object" }, { - "name": "567", + "name": "572", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17715,11 +17958,11 @@ "meta-type": "object" }, { - "name": "568", + "name": "573", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17733,22 +17976,22 @@ { "name": "encrypt", "default": null, - "type": "693" + "type": "698" } ], "meta-type": "object" }, { - "name": "569", + "name": "574", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "data-file", "default": null, - "type": "543" + "type": "548" }, { "name": "data-file-raw", @@ -17767,7 +18010,7 @@ { "name": "version", "default": null, - "type": "694" + "type": "699" }, { "name": "backing-file", @@ -17777,12 +18020,12 @@ { "name": "backing-fmt", "default": null, - "type": "300" + "type": "304" }, { "name": "encrypt", "default": null, - "type": "693" + "type": "698" }, { "name": "cluster-size", @@ -17792,7 +18035,7 @@ { "name": "preallocation", "default": null, - "type": "688" + "type": "693" }, { "name": "lazy-refcounts", @@ -17807,17 +18050,17 @@ { "name": "compression-type", "default": null, - "type": "695" + "type": "700" } ], "meta-type": "object" }, { - "name": "570", + "name": "575", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17831,7 +18074,7 @@ { "name": "backing-fmt", "default": null, - "type": "300" + "type": "304" }, { "name": "cluster-size", @@ -17847,11 +18090,11 @@ "meta-type": "object" }, { - "name": "571", + "name": "576", "members": [ { "name": "location", - "type": "330" + "type": "334" }, { "name": "size", @@ -17865,17 +18108,17 @@ { "name": "encrypt", "default": null, - "type": "696" + "type": "701" } ], "meta-type": "object" }, { - "name": "572", + "name": "577", "members": [ { "name": "location", - "type": "332" + "type": "336" }, { "name": "size", @@ -17885,11 +18128,11 @@ "meta-type": "object" }, { - "name": "573", + "name": "578", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17898,17 +18141,17 @@ { "name": "preallocation", "default": null, - "type": "688" + "type": "693" } ], "meta-type": "object" }, { - "name": "574", + "name": "579", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17927,7 +18170,7 @@ { "name": "subformat", "default": null, - "type": "697" + "type": "702" }, { "name": "block-state-zero", @@ -17938,11 +18181,11 @@ "meta-type": "object" }, { - "name": "575", + "name": "580", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -17951,12 +18194,12 @@ { "name": "extents", "default": null, - "type": "[543]" + "type": "[548]" }, { "name": "subformat", "default": null, - "type": "698" + "type": "703" }, { "name": "backing-file", @@ -17966,7 +18209,7 @@ { "name": "adapter-type", "default": null, - "type": "699" + "type": "704" }, { "name": "hwversion", @@ -17987,11 +18230,11 @@ "meta-type": "object" }, { - "name": "576", + "name": "581", "members": [ { "name": "file", - "type": "543" + "type": "548" }, { "name": "size", @@ -18000,7 +18243,7 @@ { "name": "subformat", "default": null, - "type": "700" + "type": "705" }, { "name": "force-size", @@ -18011,11 +18254,11 @@ "meta-type": "object" }, { - "name": "577", + "name": "582", "members": [ { "name": "state", - "type": "701" + "type": "706" }, { "name": "new-secret", @@ -18046,12 +18289,12 @@ "meta-type": "object" }, { - "name": "578", + "name": "583", "members": [ { "name": "encrypt", "default": null, - "type": "702" + "type": "707" } ], "meta-type": "object" @@ -18062,7 +18305,7 @@ "meta-type": "builtin" }, { - "name": "579", + "name": "584", "members": [ { "name": "inet" @@ -18086,47 +18329,47 @@ ] }, { - "name": "580", + "name": "585", "members": [ { "name": "data", - "type": "561" + "type": "566" } ], "meta-type": "object" }, { - "name": "581", + "name": "586", "members": [ { "name": "data", - "type": "600" + "type": "605" } ], "meta-type": "object" }, { - "name": "582", + "name": "587", "members": [ { "name": "data", - "type": "601" + "type": "606" } ], "meta-type": "object" }, { - "name": "583", + "name": "588", "members": [ { "name": "data", - "type": "599" + "type": "604" } ], "meta-type": "object" }, { - "name": "584", + "name": "589", "members": [ { "name": "off" @@ -18146,7 +18389,7 @@ ] }, { - "name": "585", + "name": "590", "members": [ { "name": "file" @@ -18242,142 +18485,142 @@ ] }, { - "name": "586", + "name": "591", "members": [ { "name": "data", - "type": "703" + "type": "708" } ], "meta-type": "object" }, { - "name": "587", + "name": "592", "members": [ { "name": "data", - "type": "704" + "type": "709" } ], "meta-type": "object" }, { - "name": "588", + "name": "593", "members": [ { "name": "data", - "type": "705" + "type": "710" } ], "meta-type": "object" }, { - "name": "589", + "name": "594", "members": [ { "name": "data", - "type": "706" + "type": "711" } ], "meta-type": "object" }, { - "name": "590", + "name": "595", "members": [ { "name": "data", - "type": "707" + "type": "712" } ], "meta-type": "object" }, { - "name": "591", + "name": "596", "members": [ { "name": "data", - "type": "708" + "type": "713" } ], "meta-type": "object" }, { - "name": "592", + "name": "597", "members": [ { "name": "data", - "type": "709" + "type": "714" } ], "meta-type": "object" }, { - "name": "593", + "name": "598", "members": [ { "name": "data", - "type": "710" + "type": "715" } ], "meta-type": "object" }, { - "name": "594", + "name": "599", "members": [ { "name": "data", - "type": "711" + "type": "716" } ], "meta-type": "object" }, { - "name": "595", + "name": "600", "members": [ { "name": "data", - "type": "712" + "type": "717" } ], "meta-type": "object" }, { - "name": "596", + "name": "601", "members": [ { "name": "data", - "type": "713" + "type": "718" } ], "meta-type": "object" }, { - "name": "597", + "name": "602", "members": [ { "name": "data", - "type": "714" + "type": "719" } ], "meta-type": "object" }, { - "name": "598", + "name": "603", "members": [ { "name": "data", - "type": "715" + "type": "720" } ], "meta-type": "object" }, { - "name": "[599]", - "element-type": "599", + "name": "[604]", + "element-type": "604", "meta-type": "array" }, { - "name": "599", + "name": "604", "members": [ { "name": "str", @@ -18387,7 +18630,7 @@ "meta-type": "object" }, { - "name": "600", + "name": "605", "members": [ { "name": "path", @@ -18407,7 +18650,7 @@ "meta-type": "object" }, { - "name": "601", + "name": "606", "members": [ { "name": "cid", @@ -18421,27 +18664,27 @@ "meta-type": "object" }, { - "name": "602", + "name": "607", "members": [ { "name": "data", - "type": "716" + "type": "721" } ], "meta-type": "object" }, { - "name": "603", + "name": "608", "members": [ { "name": "data", - "type": "717" + "type": "722" } ], "meta-type": "object" }, { - "name": "604", + "name": "609", "members": [ { "name": "number" @@ -18457,7 +18700,7 @@ ] }, { - "name": "605", + "name": "610", "members": [ { "name": "data", @@ -18467,17 +18710,17 @@ "meta-type": "object" }, { - "name": "606", + "name": "611", "members": [ { "name": "data", - "type": "718" + "type": "723" } ], "meta-type": "object" }, { - "name": "607", + "name": "612", "members": [ { "name": "key" @@ -18505,47 +18748,47 @@ ] }, { - "name": "608", + "name": "613", "members": [ { "name": "data", - "type": "719" + "type": "724" } ], "meta-type": "object" }, { - "name": "609", + "name": "614", "members": [ { "name": "data", - "type": "720" + "type": "725" } ], "meta-type": "object" }, { - "name": "610", + "name": "615", "members": [ { "name": "data", - "type": "721" + "type": "726" } ], "meta-type": "object" }, { - "name": "611", + "name": "616", "members": [ { "name": "data", - "type": "722" + "type": "727" } ], "meta-type": "object" }, { - "name": "612", + "name": "617", "members": [ { "name": "lctrl-lalt" @@ -18570,12 +18813,12 @@ "meta-type": "builtin" }, { - "name": "[613]", - "element-type": "613", + "name": "[618]", + "element-type": "618", "meta-type": "array" }, { - "name": "613", + "name": "618", "members": [ { "name": "name", @@ -18588,13 +18831,13 @@ { "name": "transform", "default": null, - "type": "723" + "type": "728" } ], "meta-type": "object" }, { - "name": "614", + "name": "619", "members": [ { "name": "abort" @@ -18653,17 +18896,17 @@ ] }, { - "name": "615", + "name": "620", "members": [ { "name": "data", - "type": "724" + "type": "729" } ], "meta-type": "object" }, { - "name": "616", + "name": "621", "members": [ { "name": "data", @@ -18673,7 +18916,7 @@ "meta-type": "object" }, { - "name": "617", + "name": "622", "members": [ { "name": "data", @@ -18683,7 +18926,7 @@ "meta-type": "object" }, { - "name": "618", + "name": "623", "members": [ { "name": "data", @@ -18693,7 +18936,7 @@ "meta-type": "object" }, { - "name": "619", + "name": "624", "members": [ { "name": "data", @@ -18703,7 +18946,7 @@ "meta-type": "object" }, { - "name": "620", + "name": "625", "members": [ { "name": "data", @@ -18713,7 +18956,7 @@ "meta-type": "object" }, { - "name": "621", + "name": "626", "members": [ { "name": "data", @@ -18723,7 +18966,7 @@ "meta-type": "object" }, { - "name": "622", + "name": "627", "members": [ { "name": "data", @@ -18733,7 +18976,7 @@ "meta-type": "object" }, { - "name": "623", + "name": "628", "members": [ { "name": "data", @@ -18743,7 +18986,7 @@ "meta-type": "object" }, { - "name": "624", + "name": "629", "members": [ { "name": "individual" @@ -18759,7 +19002,7 @@ ] }, { - "name": "625", + "name": "630", "members": [ { "name": "string" @@ -18799,12 +19042,12 @@ ] }, { - "name": "[626]", - "element-type": "626", + "name": "[631]", + "element-type": "631", "meta-type": "array" }, { - "name": "626", + "name": "631", "members": [ { "name": "name", @@ -18819,12 +19062,12 @@ "meta-type": "object" }, { - "name": "[627]", - "element-type": "627", + "name": "[632]", + "element-type": "632", "meta-type": "array" }, { - "name": "627", + "name": "632", "members": [ { "name": "name", @@ -18848,12 +19091,12 @@ "meta-type": "object" }, { - "name": "[628]", - "element-type": "628", + "name": "[633]", + "element-type": "633", "meta-type": "array" }, { - "name": "628", + "name": "633", "members": [ { "name": "case", @@ -18867,12 +19110,12 @@ "meta-type": "object" }, { - "name": "[629]", - "element-type": "629", + "name": "[634]", + "element-type": "634", "meta-type": "array" }, { - "name": "629", + "name": "634", "members": [ { "name": "type", @@ -18882,7 +19125,7 @@ "meta-type": "object" }, { - "name": "630", + "name": "635", "members": [ { "name": "deny" @@ -18898,12 +19141,12 @@ ] }, { - "name": "[631]", - "element-type": "631", + "name": "[636]", + "element-type": "636", "meta-type": "array" }, { - "name": "631", + "name": "636", "members": [ { "name": "match", @@ -18911,18 +19154,18 @@ }, { "name": "policy", - "type": "630" + "type": "635" }, { "name": "format", "default": null, - "type": "725" + "type": "730" } ], "meta-type": "object" }, { - "name": "632", + "name": "637", "members": [ { "name": "all" @@ -18942,7 +19185,7 @@ ] }, { - "name": "633", + "name": "638", "members": [ { "name": "before" @@ -18958,7 +19201,7 @@ ] }, { - "name": "634", + "name": "639", "members": [ { "name": "ctrl-ctrl" @@ -18990,7 +19233,7 @@ ] }, { - "name": "635", + "name": "640", "members": [ { "name": "raw" @@ -19006,7 +19249,7 @@ ] }, { - "name": "636", + "name": "641", "members": [ { "name": "iops-total", @@ -19107,7 +19350,7 @@ "meta-type": "object" }, { - "name": "637", + "name": "642", "members": [ { "name": "client" @@ -19123,7 +19366,7 @@ ] }, { - "name": "638", + "name": "643", "members": [ { "name": "uninitialized" @@ -19151,7 +19394,7 @@ ] }, { - "name": "639", + "name": "644", "members": [ { "name": "memory" @@ -19175,7 +19418,7 @@ ] }, { - "name": "640", + "name": "645", "members": [ { "name": "access-latency" @@ -19207,7 +19450,7 @@ ] }, { - "name": "641", + "name": "646", "members": [ { "name": "none" @@ -19227,7 +19470,7 @@ ] }, { - "name": "642", + "name": "647", "members": [ { "name": "none" @@ -19247,7 +19490,7 @@ ] }, { - "name": "643", + "name": "648", "members": [ { "name": "id", @@ -19286,7 +19529,7 @@ "meta-type": "object" }, { - "name": "644", + "name": "649", "members": [ { "name": "id", @@ -19309,7 +19552,7 @@ "meta-type": "object" }, { - "name": "645", + "name": "650", "members": [ { "name": "id", @@ -19348,7 +19591,7 @@ "meta-type": "object" }, { - "name": "646", + "name": "651", "members": [ { "name": "id", @@ -19375,7 +19618,7 @@ "meta-type": "object" }, { - "name": "647", + "name": "652", "members": [ { "name": "string" @@ -19399,7 +19642,7 @@ ] }, { - "name": "648", + "name": "653", "members": [ { "name": "mixing-engine", @@ -19429,7 +19672,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19440,7 +19683,7 @@ "meta-type": "object" }, { - "name": "649", + "name": "654", "members": [ { "name": "mixing-engine", @@ -19470,7 +19713,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19496,7 +19739,7 @@ "meta-type": "object" }, { - "name": "650", + "name": "655", "members": [ { "name": "mixing-engine", @@ -19526,7 +19769,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19542,7 +19785,7 @@ "meta-type": "object" }, { - "name": "651", + "name": "656", "members": [ { "name": "mixing-engine", @@ -19572,7 +19815,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19608,7 +19851,7 @@ "meta-type": "object" }, { - "name": "652", + "name": "657", "members": [ { "name": "mixing-engine", @@ -19638,7 +19881,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19664,7 +19907,7 @@ "meta-type": "object" }, { - "name": "653", + "name": "658", "members": [ { "name": "mixing-engine", @@ -19694,7 +19937,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19720,7 +19963,7 @@ "meta-type": "object" }, { - "name": "654", + "name": "659", "members": [ { "name": "mixing-engine", @@ -19750,7 +19993,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19776,7 +20019,7 @@ "meta-type": "object" }, { - "name": "655", + "name": "660", "members": [ { "name": "mixing-engine", @@ -19806,7 +20049,7 @@ { "name": "format", "default": null, - "type": "726" + "type": "731" }, { "name": "buffer-length", @@ -19822,7 +20065,7 @@ "meta-type": "object" }, { - "name": "656", + "name": "661", "members": [ { "name": "desc", @@ -19837,7 +20080,7 @@ "meta-type": "object" }, { - "name": "657", + "name": "662", "members": [ { "name": "device", @@ -19861,27 +20104,27 @@ "meta-type": "object" }, { - "name": "658", + "name": "663", "members": [ { "name": "bus", - "type": "727" + "type": "732" }, { "name": "devices", "default": null, - "type": "[516]" + "type": "[520]" } ], "meta-type": "object" }, { - "name": "[659]", - "element-type": "659", + "name": "[664]", + "element-type": "664", "meta-type": "array" }, { - "name": "659", + "name": "664", "members": [ { "name": "bar", @@ -19913,7 +20156,7 @@ "meta-type": "object" }, { - "name": "660", + "name": "665", "members": [ { "type": "int" @@ -19928,7 +20171,7 @@ "meta-type": "alternate" }, { - "name": "661", + "name": "666", "members": [ { "name": "cumulative" @@ -19956,7 +20199,7 @@ ] }, { - "name": "662", + "name": "667", "members": [ { "name": "bytes" @@ -19980,7 +20223,7 @@ ] }, { - "name": "663", + "name": "668", "members": [ { "name": "protocols", @@ -19995,7 +20238,7 @@ "meta-type": "object" }, { - "name": "664", + "name": "669", "members": [ { "name": "builtin" @@ -20015,7 +20258,7 @@ ] }, { - "name": "665", + "name": "670", "members": [ { "name": "cache-data-parity" @@ -20083,7 +20326,7 @@ ] }, { - "name": "666", + "name": "671", "members": [ { "name": "unknown" @@ -20111,7 +20354,7 @@ ] }, { - "name": "667", + "name": "672", "members": [ { "name": "qcow2" @@ -20139,57 +20382,57 @@ ] }, { - "name": "668", + "name": "673", "members": [ { "name": "data", - "type": "728" + "type": "733" } ], "meta-type": "object" }, { - "name": "669", + "name": "674", "members": [ { "name": "data", - "type": "729" + "type": "734" } ], "meta-type": "object" }, { - "name": "670", + "name": "675", "members": [ { "name": "data", - "type": "730" + "type": "735" } ], "meta-type": "object" }, { - "name": "671", + "name": "676", "members": [ { "name": "data", - "type": "731" + "type": "736" } ], "meta-type": "object" }, { - "name": "672", + "name": "677", "members": [ { "name": "data", - "type": "732" + "type": "737" } ], "meta-type": "object" }, { - "name": "673", + "name": "678", "members": [ { "name": "l1_update" @@ -20389,7 +20632,7 @@ ] }, { - "name": "674", + "name": "679", "members": [ { "name": "read" @@ -20421,7 +20664,7 @@ ] }, { - "name": "675", + "name": "680", "members": [ { "name": "inet" @@ -20433,12 +20676,12 @@ ] }, { - "name": "676", + "name": "681", "members": [ { "name": "template", "default": null, - "type": "677" + "type": "682" }, { "name": "main-header", @@ -20489,7 +20732,7 @@ "meta-type": "object" }, { - "name": "677", + "name": "682", "members": [ { "name": "none" @@ -20513,7 +20756,7 @@ ] }, { - "name": "678", + "name": "683", "members": [ { "name": "aes" @@ -20529,7 +20772,7 @@ ] }, { - "name": "679", + "name": "684", "members": [ { "name": "key-secret", @@ -20540,7 +20783,7 @@ "meta-type": "object" }, { - "name": "680", + "name": "685", "members": [ { "name": "key-secret", @@ -20551,7 +20794,7 @@ "meta-type": "object" }, { - "name": "681", + "name": "686", "members": [ { "name": "aes" @@ -20563,7 +20806,7 @@ ] }, { - "name": "682", + "name": "687", "members": [ { "name": "luks" @@ -20583,7 +20826,7 @@ ] }, { - "name": "683", + "name": "688", "members": [ { "name": "key-secret", @@ -20593,7 +20836,7 @@ "meta-type": "object" }, { - "name": "684", + "name": "689", "members": [ { "name": "key-secret", @@ -20603,7 +20846,7 @@ "meta-type": "object" }, { - "name": "685", + "name": "690", "members": [ { "name": "key-secret", @@ -20613,7 +20856,7 @@ "meta-type": "object" }, { - "name": "686", + "name": "691", "members": [ { "name": "none" @@ -20633,11 +20876,11 @@ ] }, { - "name": "687", + "name": "692", "members": [ { "name": "type", - "type": "733" + "type": "738" }, { "name": "hash", @@ -20647,7 +20890,7 @@ "meta-type": "object" }, { - "name": "688", + "name": "693", "members": [ { "name": "off" @@ -20671,7 +20914,7 @@ ] }, { - "name": "689", + "name": "694", "members": [ { "name": "aes-128" @@ -20727,7 +20970,7 @@ ] }, { - "name": "690", + "name": "695", "members": [ { "name": "ecb" @@ -20751,7 +20994,7 @@ ] }, { - "name": "691", + "name": "696", "members": [ { "name": "plain" @@ -20771,7 +21014,7 @@ ] }, { - "name": "692", + "name": "697", "members": [ { "name": "md5" @@ -20807,28 +21050,28 @@ ] }, { - "name": "693", + "name": "698", "tag": "format", "variants": [ { "case": "qcow", - "type": "679" + "type": "684" }, { "case": "luks", - "type": "735" + "type": "740" } ], "members": [ { "name": "format", - "type": "734" + "type": "739" } ], "meta-type": "object" }, { - "name": "694", + "name": "699", "members": [ { "name": "v2" @@ -20844,7 +21087,7 @@ ] }, { - "name": "695", + "name": "700", "members": [ { "name": "zlib" @@ -20860,16 +21103,16 @@ ] }, { - "name": "696", + "name": "701", "tag": "format", "variants": [ { "case": "luks", - "type": "736" + "type": "741" }, { "case": "luks2", - "type": "737" + "type": "742" }, { "case": "luks-any", @@ -20879,13 +21122,13 @@ "members": [ { "name": "format", - "type": "682" + "type": "687" } ], "meta-type": "object" }, { - "name": "697", + "name": "702", "members": [ { "name": "dynamic" @@ -20901,7 +21144,7 @@ ] }, { - "name": "698", + "name": "703", "members": [ { "name": "monolithicSparse" @@ -20929,7 +21172,7 @@ ] }, { - "name": "699", + "name": "704", "members": [ { "name": "ide" @@ -20953,7 +21196,7 @@ ] }, { - "name": "700", + "name": "705", "members": [ { "name": "dynamic" @@ -20969,7 +21212,7 @@ ] }, { - "name": "701", + "name": "706", "members": [ { "name": "active" @@ -20985,12 +21228,12 @@ ] }, { - "name": "702", + "name": "707", "tag": "format", "variants": [ { "case": "luks", - "type": "738" + "type": "743" }, { "case": "qcow", @@ -21000,13 +21243,13 @@ "members": [ { "name": "format", - "type": "734" + "type": "739" } ], "meta-type": "object" }, { - "name": "703", + "name": "708", "members": [ { "name": "logfile", @@ -21036,7 +21279,7 @@ "meta-type": "object" }, { - "name": "704", + "name": "709", "members": [ { "name": "logfile", @@ -21056,7 +21299,7 @@ "meta-type": "object" }, { - "name": "705", + "name": "710", "members": [ { "name": "logfile", @@ -21070,7 +21313,7 @@ }, { "name": "addr", - "type": "344" + "type": "348" }, { "name": "tls-creds", @@ -21121,7 +21364,7 @@ "meta-type": "object" }, { - "name": "706", + "name": "711", "members": [ { "name": "logfile", @@ -21135,18 +21378,18 @@ }, { "name": "remote", - "type": "344" + "type": "348" }, { "name": "local", "default": null, - "type": "344" + "type": "348" } ], "meta-type": "object" }, { - "name": "707", + "name": "712", "members": [ { "name": "logfile", @@ -21162,7 +21405,7 @@ "meta-type": "object" }, { - "name": "708", + "name": "713", "members": [ { "name": "logfile", @@ -21182,7 +21425,7 @@ "meta-type": "object" }, { - "name": "709", + "name": "714", "members": [ { "name": "logfile", @@ -21203,7 +21446,7 @@ "meta-type": "object" }, { - "name": "710", + "name": "715", "members": [ { "name": "logfile", @@ -21223,7 +21466,7 @@ "meta-type": "object" }, { - "name": "711", + "name": "716", "members": [ { "name": "logfile", @@ -21243,7 +21486,7 @@ "meta-type": "object" }, { - "name": "712", + "name": "717", "members": [ { "name": "logfile", @@ -21269,7 +21512,7 @@ "meta-type": "object" }, { - "name": "713", + "name": "718", "members": [ { "name": "logfile", @@ -21289,7 +21532,7 @@ "meta-type": "object" }, { - "name": "714", + "name": "719", "members": [ { "name": "logfile", @@ -21325,7 +21568,7 @@ "meta-type": "object" }, { - "name": "715", + "name": "720", "members": [ { "name": "logfile", @@ -21346,7 +21589,7 @@ "meta-type": "object" }, { - "name": "716", + "name": "721", "members": [ { "name": "path", @@ -21362,7 +21605,7 @@ "meta-type": "object" }, { - "name": "717", + "name": "722", "members": [ { "name": "chardev", @@ -21372,7 +21615,7 @@ "meta-type": "object" }, { - "name": "718", + "name": "723", "members": [ { "name": "unmapped" @@ -22028,11 +22271,11 @@ ] }, { - "name": "719", + "name": "724", "members": [ { "name": "key", - "type": "396" + "type": "400" }, { "name": "down", @@ -22042,11 +22285,11 @@ "meta-type": "object" }, { - "name": "720", + "name": "725", "members": [ { "name": "button", - "type": "739" + "type": "744" }, { "name": "down", @@ -22056,11 +22299,11 @@ "meta-type": "object" }, { - "name": "721", + "name": "726", "members": [ { "name": "axis", - "type": "740" + "type": "745" }, { "name": "value", @@ -22070,11 +22313,11 @@ "meta-type": "object" }, { - "name": "722", + "name": "727", "members": [ { "name": "type", - "type": "741" + "type": "746" }, { "name": "slot", @@ -22086,7 +22329,7 @@ }, { "name": "axis", - "type": "740" + "type": "745" }, { "name": "value", @@ -22096,7 +22339,7 @@ "meta-type": "object" }, { - "name": "723", + "name": "728", "members": [ { "name": "persistent", @@ -22107,13 +22350,13 @@ "meta-type": "object" }, { - "name": "724", + "name": "729", "members": [ ], "meta-type": "object" }, { - "name": "725", + "name": "730", "members": [ { "name": "exact" @@ -22129,7 +22372,7 @@ ] }, { - "name": "726", + "name": "731", "members": [ { "name": "u8" @@ -22165,7 +22408,7 @@ ] }, { - "name": "727", + "name": "732", "members": [ { "name": "number", @@ -22181,21 +22424,21 @@ }, { "name": "io_range", - "type": "742" + "type": "747" }, { "name": "memory_range", - "type": "742" + "type": "747" }, { "name": "prefetchable_range", - "type": "742" + "type": "747" } ], "meta-type": "object" }, { - "name": "728", + "name": "733", "members": [ { "name": "compat", @@ -22233,22 +22476,22 @@ { "name": "encrypt", "default": null, - "type": "743" + "type": "748" }, { "name": "bitmaps", "default": null, - "type": "[744]" + "type": "[749]" }, { "name": "compression-type", - "type": "695" + "type": "700" } ], "meta-type": "object" }, { - "name": "729", + "name": "734", "members": [ { "name": "create-type", @@ -22264,34 +22507,34 @@ }, { "name": "extents", - "type": "[745]" + "type": "[750]" } ], "meta-type": "object" }, { - "name": "730", + "name": "735", "members": [ { "name": "cipher-alg", - "type": "689" + "type": "694" }, { "name": "cipher-mode", - "type": "690" + "type": "695" }, { "name": "ivgen-alg", - "type": "691" + "type": "696" }, { "name": "ivgen-hash-alg", "default": null, - "type": "692" + "type": "697" }, { "name": "hash-alg", - "type": "692" + "type": "697" }, { "name": "payload-offset", @@ -22307,24 +22550,24 @@ }, { "name": "slots", - "type": "[746]" + "type": "[751]" } ], "meta-type": "object" }, { - "name": "731", + "name": "736", "members": [ { "name": "encryption-format", "default": null, - "type": "682" + "type": "687" } ], "meta-type": "object" }, { - "name": "732", + "name": "737", "members": [ { "name": "extent-size-hint", @@ -22335,7 +22578,7 @@ "meta-type": "object" }, { - "name": "733", + "name": "738", "members": [ { "name": "md5" @@ -22355,7 +22598,7 @@ ] }, { - "name": "734", + "name": "739", "members": [ { "name": "qcow" @@ -22371,7 +22614,7 @@ ] }, { - "name": "735", + "name": "740", "members": [ { "name": "key-secret", @@ -22381,27 +22624,27 @@ { "name": "cipher-alg", "default": null, - "type": "689" + "type": "694" }, { "name": "cipher-mode", "default": null, - "type": "690" + "type": "695" }, { "name": "ivgen-alg", "default": null, - "type": "691" + "type": "696" }, { "name": "ivgen-hash-alg", "default": null, - "type": "692" + "type": "697" }, { "name": "hash-alg", "default": null, - "type": "692" + "type": "697" }, { "name": "iter-time", @@ -22412,7 +22655,7 @@ "meta-type": "object" }, { - "name": "736", + "name": "741", "members": [ { "name": "key-secret", @@ -22421,13 +22664,13 @@ { "name": "cipher-alg", "default": null, - "type": "689" + "type": "694" } ], "meta-type": "object" }, { - "name": "737", + "name": "742", "members": [ { "name": "key-secret", @@ -22436,17 +22679,17 @@ { "name": "cipher-alg", "default": null, - "type": "689" + "type": "694" } ], "meta-type": "object" }, { - "name": "738", + "name": "743", "members": [ { "name": "state", - "type": "701" + "type": "706" }, { "name": "new-secret", @@ -22477,7 +22720,7 @@ "meta-type": "object" }, { - "name": "739", + "name": "744", "members": [ { "name": "left" @@ -22525,7 +22768,7 @@ ] }, { - "name": "740", + "name": "745", "members": [ { "name": "x" @@ -22541,7 +22784,7 @@ ] }, { - "name": "741", + "name": "746", "members": [ { "name": "begin" @@ -22569,7 +22812,7 @@ ] }, { - "name": "742", + "name": "747", "members": [ { "name": "base", @@ -22583,12 +22826,12 @@ "meta-type": "object" }, { - "name": "743", + "name": "748", "tag": "format", "variants": [ { "case": "luks", - "type": "730" + "type": "735" }, { "case": "aes", @@ -22598,18 +22841,18 @@ "members": [ { "name": "format", - "type": "678" + "type": "683" } ], "meta-type": "object" }, { - "name": "[744]", - "element-type": "744", + "name": "[749]", + "element-type": "749", "meta-type": "array" }, { - "name": "744", + "name": "749", "members": [ { "name": "name", @@ -22621,18 +22864,18 @@ }, { "name": "flags", - "type": "[747]" + "type": "[752]" } ], "meta-type": "object" }, { - "name": "[745]", - "element-type": "745", + "name": "[750]", + "element-type": "750", "meta-type": "array" }, { - "name": "745", + "name": "750", "members": [ { "name": "filename", @@ -22660,12 +22903,12 @@ "meta-type": "object" }, { - "name": "[746]", - "element-type": "746", + "name": "[751]", + "element-type": "751", "meta-type": "array" }, { - "name": "746", + "name": "751", "members": [ { "name": "active", @@ -22689,12 +22932,12 @@ "meta-type": "object" }, { - "name": "[747]", - "element-type": "747", + "name": "[752]", + "element-type": "752", "meta-type": "array" }, { - "name": "747", + "name": "752", "members": [ { "name": "in-use" @@ -22729,6 +22972,18 @@ { "name": "cxl-inject-uncorrectable-errors" }, + { + "name": "cxl-inject-poison" + }, + { + "name": "cxl-inject-memory-module-event" + }, + { + "name": "cxl-inject-dram-event" + }, + { + "name": "cxl-inject-general-media-event" + }, { "name": "query-cryptodev" }, @@ -22870,9 +23125,6 @@ { "name": "x-query-ramblock" }, - { - "name": "x-query-profile" - }, { "name": "x-query-opcount" }, @@ -23441,10 +23693,6 @@ "name": "pc-i440fx-7.2-machine", "parent": "generic-pc-machine" }, - { - "name": "tpm-crb", - "parent": "device" - }, { "name": "isa-applesmc", "parent": "isa-device" @@ -23461,13 +23709,17 @@ "name": "usb-redir", "parent": "usb-device" }, + { + "name": "virtio-rng-device", + "parent": "virtio-device" + }, { "name": "floppy-bus", "parent": "bus" }, { - "name": "virtio-crypto-device", - "parent": "virtio-device" + "name": "chardev-stdio", + "parent": "chardev-fd" }, { "name": "chardev-testdev", @@ -23481,6 +23733,10 @@ "name": "Icelake-Server-v1-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "Haswell-v1-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "sev-guest", "parent": "confidential-guest-support" @@ -23510,16 +23766,16 @@ "parent": "pit-common" }, { - "name": "Haswell-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "tpm-crb", + "parent": "device" }, { "name": "rtl8139", "parent": "pci-device" }, { - "name": "virtio-rng-device", - "parent": "virtio-device" + "name": "core2duo-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "pci-bridge", @@ -23534,8 +23790,8 @@ "parent": "pcie-root-port-base" }, { - "name": "core2duo-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-crypto-device", + "parent": "virtio-device" }, { "name": "ich9-usb-uhci5", @@ -23906,8 +24162,8 @@ "parent": "pci-ehci-usb" }, { - "name": "mch", - "parent": "pci-device" + "name": "pc-q35-3.0-machine", + "parent": "generic-pc-machine" }, { "name": "virtio-input-host-pci", @@ -23918,8 +24174,8 @@ "parent": "pc-dimm" }, { - "name": "pc-q35-3.0-machine", - "parent": "generic-pc-machine" + "name": "mch", + "parent": "pci-device" }, { "name": "Icelake-Server-v5-x86_64-cpu", @@ -23994,16 +24250,16 @@ "parent": "chardev-ringbuf" }, { - "name": "i82557a", - "parent": "pci-device" + "name": "Haswell-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "vhost-user-scsi-pci-non-transitional", "parent": "vhost-user-scsi-pci-base" }, { - "name": "vmmouse", - "parent": "isa-device" + "name": "i82557a", + "parent": "pci-device" }, { "name": "chardev-udp", @@ -24022,8 +24278,8 @@ "parent": "virtio-scsi-pci-base" }, { - "name": "Haswell-v3-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "vmmouse", + "parent": "isa-device" }, { "name": "migration", @@ -24057,6 +24313,10 @@ "name": "vhost-user-vga", "parent": "vhost-user-vga-base-type" }, + { + "name": "SapphireRapids-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "Skylake-Client-v4-x86_64-cpu", "parent": "x86_64-cpu" @@ -24129,21 +24389,21 @@ "name": "ide-cf", "parent": "ide-device" }, - { - "name": "vhost-scsi", - "parent": "vhost-scsi-common" - }, { "name": "usb-tablet", "parent": "usb-hid" }, + { + "name": "sd-card", + "parent": "device" + }, { "name": "sysbus-ahci", "parent": "sys-bus-device" }, { - "name": "sd-card", - "parent": "device" + "name": "vhost-scsi", + "parent": "vhost-scsi-common" }, { "name": "pc-q35-4.0.1-machine", @@ -24165,14 +24425,14 @@ "name": "esp", "parent": "device" }, - { - "name": "ne2k_pci", - "parent": "pci-device" - }, { "name": "IvyBridge-v2-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "ne2k_pci", + "parent": "pci-device" + }, { "name": "usb-bus", "parent": "bus" @@ -24334,8 +24594,8 @@ "parent": "virtio-serial-pci-base" }, { - "name": "main-loop", - "parent": "event-loop-base" + "name": "vhost-user-scmi-pci", + "parent": "vhost-user-scmi-pci-base" }, { "name": "xen-bridge", @@ -24397,13 +24657,17 @@ "name": "vhost-user-blk-pci-non-transitional", "parent": "vhost-user-blk-pci-base" }, + { + "name": "Cooperlake-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "cirrus-vga", "parent": "pci-device" }, { - "name": "Cooperlake-v2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "main-loop", + "parent": "event-loop-base" }, { "name": "kvm32-v1-x86_64-cpu", @@ -24494,8 +24758,8 @@ "parent": "e1000-base" }, { - "name": "vhost-user-scsi", - "parent": "vhost-scsi-common" + "name": "igbvf", + "parent": "pci-device" }, { "name": "pxb-pcie-bus", @@ -24506,8 +24770,8 @@ "parent": "pci-device" }, { - "name": "igbvf", - "parent": "pci-device" + "name": "vhost-user-scsi", + "parent": "vhost-scsi-common" }, { "name": "PIIX4_PM", @@ -24601,14 +24865,14 @@ "name": "pci-ohci", "parent": "pci-device" }, - { - "name": "virtio-tablet-device", - "parent": "virtio-input-hid-device" - }, { "name": "Haswell-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "virtio-tablet-device", + "parent": "virtio-input-hid-device" + }, { "name": "EPYC-Genoa-x86_64-cpu", "parent": "x86_64-cpu" @@ -24654,11 +24918,11 @@ "parent": "usb-device" }, { - "name": "SandyBridge-v1-x86_64-cpu", + "name": "IvyBridge-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "IvyBridge-x86_64-cpu", + "name": "SandyBridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -24785,13 +25049,17 @@ "name": "x-remote-iommu", "parent": "object" }, + { + "name": "port92", + "parent": "isa-device" + }, { "name": "pc-i440fx-2.4-machine", "parent": "generic-pc-machine" }, { - "name": "port92", - "parent": "isa-device" + "name": "vhost-user-scmi", + "parent": "virtio-device" }, { "name": "isa-cirrus-vga", @@ -25274,20 +25542,20 @@ "parent": "object" }, { - "name": "pxb-bus", - "parent": "PCI" + "name": "virtio-mmio", + "parent": "sys-bus-device" }, { "name": "KnightsMill-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "pentium2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pxb-bus", + "parent": "PCI" }, { - "name": "virtio-mmio", - "parent": "sys-bus-device" + "name": "pentium2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "Broadwell-v1-x86_64-cpu", @@ -25861,6 +26129,10 @@ "name": "base-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "GraniteRapids-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "hyperv-synic", "parent": "device" @@ -25949,10 +26221,6 @@ "name": "sd-bus", "parent": "bus" }, - { - "name": "virtio-vga", - "parent": "virtio-vga-base-type" - }, { "name": "filter-dump", "parent": "netfilter" @@ -26002,8 +26270,12 @@ "parent": "virtio-blk-pci-base" }, { - "name": "chardev-stdio", - "parent": "chardev-fd" + "name": "virtio-vga", + "parent": "virtio-vga-base-type" + }, + { + "name": "GraniteRapids-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "authz-pam", @@ -26057,6 +26329,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -26469,6 +26747,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -26907,6 +27191,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -27207,6 +27497,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -27258,8 +27554,8 @@ "type": "uint4" }, { - "default-value": 4294967295, - "name": "x-pci-sub-vendor-id", + "default-value": 0, + "name": "x-igd-gms", "type": "uint32" }, { @@ -27298,9 +27594,9 @@ "type": "str" }, { - "default-value": false, - "name": "x-enable-migration", - "type": "bool" + "default-value": 4294967295, + "name": "x-pci-sub-vendor-id", + "type": "uint32" }, { "default-value": false, @@ -27314,9 +27610,9 @@ "type": "bool" }, { - "default-value": 0, - "name": "x-igd-gms", - "type": "uint32" + "default-value": false, + "name": "x-no-kvm-intx", + "type": "bool" }, { "default-value": 1100, @@ -27324,9 +27620,10 @@ "type": "uint32" }, { - "default-value": false, - "name": "x-no-kvm-intx", - "type": "bool" + "default-value": "auto", + "name": "enable-migration", + "description": "on/off/auto", + "type": "OnOffAuto" }, { "default-value": false, @@ -27781,6 +28078,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28117,6 +28420,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28241,6 +28550,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28318,6 +28633,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28460,6 +28781,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28822,6 +29149,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -28986,6 +29319,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -29452,6 +29791,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -29579,6 +29924,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -29927,6 +30278,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -30185,6 +30542,12 @@ "name": "rombar", "type": "uint32" }, + { + "default-value": false, + "name": "x-pcie-ari-nextfn-1", + "description": "on/off", + "type": "bool" + }, { "default-value": true, "name": "x-pcie-err-unc-mask", @@ -30792,6 +31155,10 @@ "name": "x-vendor-cpuid-only", "type": "bool" }, + { + "name": "pbrsb-no", + "type": "bool" + }, { "name": "vmx-unrestricted-guest", "type": "bool" @@ -31297,6 +31664,10 @@ "name": "ds-cpl", "type": "bool" }, + { + "name": "vmx-ept-execonly", + "type": "bool" + }, { "name": "fsrm", "type": "bool" @@ -31326,7 +31697,7 @@ "type": "bool" }, { - "name": "vmx-ept-execonly", + "name": "vmx-exit-clear-bndcfgs", "type": "bool" }, { @@ -31354,7 +31725,7 @@ "type": "bool" }, { - "name": "vmx-exit-clear-bndcfgs", + "name": "psdp-no", "type": "bool" }, { @@ -31763,10 +32134,18 @@ "name": "vmx-cr8-store-exit", "type": "bool" }, + { + "name": "sbdr-ssdp-no", + "type": "bool" + }, { "name": "kvm-mmu", "type": "bool" }, + { + "name": "vmx-ept-1gb", + "type": "bool" + }, { "name": "nrip-save", "type": "bool" @@ -31832,7 +32211,7 @@ "type": "bool" }, { - "name": "vmx-ept-1gb", + "name": "fbsdp-no", "type": "bool" }, { @@ -32188,6 +32567,10 @@ "name": "xgetbv1", "type": "bool" }, + { + "name": "mcdt-no", + "type": "bool" + }, { "name": "spec-ctrl", "type": "bool" @@ -32582,7 +32965,7 @@ "numa-mem-supported": false, "default-cpu-type": "qemu64-x86_64-cpu", "acpi": true, - "cpu-max": 288, + "cpu-max": 1024, "deprecated": false, "default-ram-id": "pc.ram", "alias": "q35" @@ -33914,6 +34297,63 @@ "migration-safe": true, "deprecated": false }, + { + "name": "SapphireRapids-v2", + "typename": "SapphireRapids-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "bus-lock-detect", + "fsrm", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "avx-vnni", + "avx512-bf16", + "fzrm", + "fsrs", + "fsrc", + "xsaves", + "xfd", + "avx512f", + "avx512f", + "avx512f", + "pku", + "amx-tile", + "amx-tile", + "ibrs-all", + "taa-no", + "sbdr-ssdp-no", + "fbsdp-no", + "psdp-no" + ], + "static": false, + "migration-safe": true, + "deprecated": false + }, { "name": "SapphireRapids-v1", "typename": "SapphireRapids-v1-x86_64-cpu", @@ -34704,6 +35144,129 @@ "migration-safe": true, "deprecated": false }, + { + "name": "GraniteRapids-v1", + "typename": "GraniteRapids-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "bus-lock-detect", + "fsrm", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "avx-vnni", + "avx512-bf16", + "fzrm", + "fsrs", + "fsrc", + "amx-fp16", + "xsaves", + "xfd", + "avx512f", + "avx512f", + "avx512f", + "pku", + "amx-tile", + "amx-tile", + "ibrs-all", + "taa-no", + "sbdr-ssdp-no", + "fbsdp-no", + "psdp-no", + "pbrsb-no", + "prefetchiti", + "mcdt-no" + ], + "static": false, + "migration-safe": true, + "deprecated": false + }, + { + "name": "GraniteRapids", + "typename": "GraniteRapids-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "bus-lock-detect", + "fsrm", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "avx-vnni", + "avx512-bf16", + "fzrm", + "fsrs", + "fsrc", + "amx-fp16", + "xsaves", + "xfd", + "avx512f", + "avx512f", + "avx512f", + "pku", + "amx-tile", + "amx-tile", + "ibrs-all", + "taa-no", + "sbdr-ssdp-no", + "fbsdp-no", + "psdp-no", + "pbrsb-no", + "prefetchiti", + "mcdt-no" + ], + "alias-of": "GraniteRapids-v1", + "static": false, + "migration-safe": true, + "deprecated": false + }, { "name": "EPYC-v4", "typename": "EPYC-v4-x86_64-cpu", @@ -35884,6 +36447,10 @@ }, { "parameters": [ + { + "name": "chroot", + "type": "string" + }, { "name": "async-teardown", "type": "boolean" @@ -37046,6 +37613,10 @@ { "state": false, "capability": "postcopy-preempt" + }, + { + "state": false, + "capability": "switchover-ack" } ], "id": "libvirt-46" @@ -37111,6 +37682,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": true, + "mcdt-no": false, "bus-lock-detect": false, "xsavec": true, "intel-pt": false, @@ -37240,6 +37812,7 @@ "vmx-tsc-offset": false, "kvm-nopiodelay": true, "tm": false, + "fbsdp-no": false, "kvmclock-stable-bit": true, "vmx-rdtsc-exit": false, "hypervisor": true, @@ -37267,6 +37840,7 @@ "cldemote": false, "sgx-tokenkey": false, "vmx-ept": false, + "pbrsb-no": false, "xfd": false, "kvm-mmu": false, "sse4.2": true, @@ -37322,6 +37896,7 @@ "tsc-adjust": true, "vnmi": false, "kvm-steal-time": true, + "psdp-no": false, "avx512-vp2intersect": false, "kvmclock": true, "vmx-zero-len-inject": false, @@ -37361,6 +37936,7 @@ "fsrm": false, "fsrs": false, "fsrc": false, + "sbdr-ssdp-no": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, "umip": true, @@ -37483,6 +38059,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": true, + "mcdt-no": false, "bus-lock-detect": false, "xsavec": true, "intel-pt": false, @@ -37612,6 +38189,7 @@ "vmx-tsc-offset": false, "kvm-nopiodelay": true, "tm": false, + "fbsdp-no": false, "kvmclock-stable-bit": true, "vmx-rdtsc-exit": false, "hypervisor": true, @@ -37639,6 +38217,7 @@ "cldemote": false, "sgx-tokenkey": false, "vmx-ept": false, + "pbrsb-no": false, "xfd": false, "kvm-mmu": false, "sse4.2": true, @@ -37694,6 +38273,7 @@ "tsc-adjust": true, "vnmi": false, "kvm-steal-time": true, + "psdp-no": false, "avx512-vp2intersect": false, "kvmclock": true, "vmx-zero-len-inject": false, @@ -37733,6 +38313,7 @@ "fsrm": false, "fsrs": false, "fsrc": false, + "sbdr-ssdp-no": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, "umip": true, @@ -37861,6 +38442,7 @@ "gfni": false, "ibrs-all": false, "pause-filter": true, + "mcdt-no": false, "bus-lock-detect": false, "xsavec": true, "intel-pt": false, @@ -38029,6 +38611,7 @@ "kvm_nopiodelay": true, "tm": false, "hv-enforce-cpuid": false, + "fbsdp-no": false, "kvmclock-stable-bit": true, "vmx-rdtsc-exit": false, "hypervisor": true, @@ -38066,6 +38649,7 @@ "sgx-tokenkey": false, "cldemote": false, "vmx-ept": false, + "pbrsb-no": false, "hv-tlbflush-direct": true, "xfd": false, "hv-reenlightenment": true, @@ -38145,6 +38729,7 @@ "tsc-adjust": true, "tsc_adjust": true, "kvm-steal-time": true, + "psdp-no": false, "kvm_steal_time": true, "avx512-vp2intersect": false, "kvmclock": true, @@ -38189,6 +38774,7 @@ "fsrs": false, "fsrm": false, "fsrc": false, + "sbdr-ssdp-no": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, "vmx-store-lma": false, @@ -38619,7 +39205,6 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "gfni", "cldemote", @@ -38628,7 +39213,6 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", "xsavec", "xsaves" ], @@ -38642,7 +39226,6 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "gfni", "cldemote", @@ -38652,7 +39235,6 @@ "arch-capabilities", "core-capability", "ssbd", - "3dnowprefetch", "xsavec", "xsaves", "split-lock-detect" @@ -38667,7 +39249,6 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "gfni", "cldemote", @@ -38677,7 +39258,6 @@ "arch-capabilities", "core-capability", "ssbd", - "3dnowprefetch", "xsavec", "split-lock-detect" ], @@ -38691,7 +39271,6 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "gfni", "cldemote", @@ -38701,7 +39280,6 @@ "arch-capabilities", "core-capability", "ssbd", - "3dnowprefetch", "xsavec", "split-lock-detect" ], @@ -38715,7 +39293,6 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "gfni", "cldemote", @@ -38725,7 +39302,6 @@ "arch-capabilities", "core-capability", "ssbd", - "3dnowprefetch", "xsavec", "split-lock-detect" ], @@ -38744,12 +39320,10 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec", "xsaves" ], @@ -38767,12 +39341,10 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38789,12 +39361,10 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38813,12 +39383,10 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38837,11 +39405,9 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38858,12 +39424,10 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Server-v3", @@ -38883,12 +39447,10 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Server-v2", @@ -38908,11 +39470,9 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Server-v1", @@ -38928,9 +39488,7 @@ "x2apic", "tsc-deadline", "invpcid", - "rdseed", "spec-ctrl", - "3dnowprefetch", "xsavec", "xsaves" ], @@ -38946,9 +39504,7 @@ "x2apic", "tsc-deadline", "invpcid", - "rdseed", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38965,9 +39521,7 @@ "hle", "invpcid", "rtm", - "rdseed", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "static": false, @@ -38984,8 +39538,6 @@ "hle", "invpcid", "rtm", - "rdseed", - "3dnowprefetch", "xsavec" ], "static": false, @@ -39000,9 +39552,7 @@ "x2apic", "tsc-deadline", "invpcid", - "rdseed", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Client-v3", @@ -39020,9 +39570,7 @@ "hle", "invpcid", "rtm", - "rdseed", "spec-ctrl", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Client-v2", @@ -39040,8 +39588,6 @@ "hle", "invpcid", "rtm", - "rdseed", - "3dnowprefetch", "xsavec" ], "alias-of": "Skylake-Client-v1", @@ -39049,6 +39595,50 @@ "migration-safe": true, "deprecated": false }, + { + "name": "SapphireRapids-v2", + "typename": "SapphireRapids-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "x2apic", + "tsc-deadline", + "hle", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "sha-ni", + "avx512bw", + "avx512vl", + "avx512vbmi", + "avx512vbmi2", + "gfni", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "bus-lock-detect", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "arch-capabilities", + "ssbd", + "avx-vnni", + "avx512-bf16", + "xsavec", + "xsaves", + "xfd" + ], + "static": false, + "migration-safe": true, + "deprecated": false + }, { "name": "SapphireRapids-v1", "typename": "SapphireRapids-v1-x86_64-cpu", @@ -39061,7 +39651,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -39074,7 +39663,6 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "bus-lock-detect", "serialize", "tsx-ldtrk", @@ -39087,17 +39675,9 @@ "ssbd", "avx-vnni", "avx512-bf16", - "3dnowprefetch", - "wbnoinvd", "xsavec", "xsaves", - "xfd", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xfd" ], "static": false, "migration-safe": true, @@ -39115,7 +39695,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -39128,7 +39707,6 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "bus-lock-detect", "serialize", "tsx-ldtrk", @@ -39141,17 +39719,9 @@ "ssbd", "avx-vnni", "avx512-bf16", - "3dnowprefetch", - "wbnoinvd", "xsavec", "xsaves", - "xfd", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xfd" ], "alias-of": "SapphireRapids-v1", "static": false, @@ -39230,7 +39800,6 @@ "typename": "Opteron_G5-v1-x86_64-cpu", "unavailable-features": [ "misalignsse", - "3dnowprefetch", "xop", "fma4", "tbm", @@ -39245,7 +39814,6 @@ "typename": "Opteron_G5-x86_64-cpu", "unavailable-features": [ "misalignsse", - "3dnowprefetch", "xop", "fma4", "tbm", @@ -39261,7 +39829,6 @@ "typename": "Opteron_G4-v1-x86_64-cpu", "unavailable-features": [ "misalignsse", - "3dnowprefetch", "xop", "fma4", "nrip-save" @@ -39275,7 +39842,6 @@ "typename": "Opteron_G4-x86_64-cpu", "unavailable-features": [ "misalignsse", - "3dnowprefetch", "xop", "fma4", "nrip-save" @@ -39391,14 +39957,12 @@ "x2apic", "tsc-deadline", "avx512f", - "rdseed", "avx512pf", "avx512er", "avx512cd", "avx512-vpopcntdq", "avx512-4vnniw", - "avx512-4fmaps", - "3dnowprefetch" + "avx512-4fmaps" ], "static": false, "migration-safe": true, @@ -39411,14 +39975,12 @@ "x2apic", "tsc-deadline", "avx512f", - "rdseed", "avx512pf", "avx512er", "avx512cd", "avx512-vpopcntdq", "avx512-4vnniw", - "avx512-4fmaps", - "3dnowprefetch" + "avx512-4fmaps" ], "alias-of": "KnightsMill-v1", "static": false, @@ -39483,7 +40045,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -39496,20 +40057,11 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec", - "xsaves", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsaves" ], "static": false, "migration-safe": true, @@ -39525,7 +40077,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -39538,20 +40089,11 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec", - "xsaves", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsaves" ], "static": false, "migration-safe": true, @@ -39567,7 +40109,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -39580,19 +40121,10 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "wbnoinvd", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -39608,7 +40140,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -39622,15 +40153,7 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "wbnoinvd", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -39646,7 +40169,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -39659,8 +40181,6 @@ "avx512-vpopcntdq", "spec-ctrl", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec" ], "static": false, @@ -39679,7 +40199,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -39692,8 +40211,6 @@ "avx512-vpopcntdq", "spec-ctrl", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec" ], "static": false, @@ -39710,7 +40227,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -39723,8 +40239,6 @@ "avx512-vpopcntdq", "spec-ctrl", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec" ], "alias-of": "Icelake-Server-v2", @@ -39744,7 +40258,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -39757,8 +40270,6 @@ "avx512-vpopcntdq", "spec-ctrl", "ssbd", - "3dnowprefetch", - "wbnoinvd", "xsavec" ], "alias-of": "Icelake-Server-v1", @@ -39886,20 +40397,112 @@ "migration-safe": true, "deprecated": false }, + { + "name": "GraniteRapids-v1", + "typename": "GraniteRapids-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "x2apic", + "tsc-deadline", + "hle", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "sha-ni", + "avx512bw", + "avx512vl", + "avx512vbmi", + "avx512vbmi2", + "gfni", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "bus-lock-detect", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "arch-capabilities", + "ssbd", + "avx-vnni", + "avx512-bf16", + "amx-fp16", + "xsavec", + "xsaves", + "xfd", + "prefetchiti", + "mcdt-no" + ], + "static": false, + "migration-safe": true, + "deprecated": false + }, + { + "name": "GraniteRapids", + "typename": "GraniteRapids-x86_64-cpu", + "unavailable-features": [ + "pcid", + "x2apic", + "tsc-deadline", + "hle", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512ifma", + "avx512cd", + "sha-ni", + "avx512bw", + "avx512vl", + "avx512vbmi", + "avx512vbmi2", + "gfni", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "bus-lock-detect", + "serialize", + "tsx-ldtrk", + "amx-bf16", + "avx512-fp16", + "amx-tile", + "amx-int8", + "spec-ctrl", + "arch-capabilities", + "ssbd", + "avx-vnni", + "avx512-bf16", + "amx-fp16", + "xsavec", + "xsaves", + "xfd", + "prefetchiti", + "mcdt-no" + ], + "alias-of": "GraniteRapids-v1", + "static": false, + "migration-safe": true, + "deprecated": false + }, { "name": "EPYC-v4", "typename": "EPYC-v4-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", "ibpb", "nrip-save", "xsavec", @@ -39913,16 +40516,13 @@ "name": "EPYC-v3", "typename": "EPYC-v3-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", "ibpb", "nrip-save", "xsavec", @@ -39936,11 +40536,9 @@ "name": "EPYC-v2", "typename": "EPYC-v2-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "ibpb", @@ -39955,11 +40553,9 @@ "name": "EPYC-v1", "typename": "EPYC-v1-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "nrip-save", @@ -39973,18 +40569,13 @@ "name": "EPYC-Rome-v4", "typename": "EPYC-Rome-v4-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40000,18 +40591,13 @@ "name": "EPYC-Rome-v3", "typename": "EPYC-Rome-v3-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40028,18 +40614,13 @@ "name": "EPYC-Rome-v2", "typename": "EPYC-Rome-v2-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40056,18 +40637,13 @@ "name": "EPYC-Rome-v1", "typename": "EPYC-Rome-v1-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "amd-stibp", "nrip-save", @@ -40082,18 +40658,13 @@ "name": "EPYC-Rome", "typename": "EPYC-Rome-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "amd-stibp", "nrip-save", @@ -40111,19 +40682,14 @@ "unavailable-features": [ "pcid", "invpcid", - "rdseed", "sha-ni", "vpclmulqdq", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40147,18 +40713,13 @@ "unavailable-features": [ "pcid", "invpcid", - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40177,18 +40738,13 @@ "unavailable-features": [ "pcid", "invpcid", - "rdseed", "sha-ni", - "rdpid", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40206,11 +40762,9 @@ "name": "EPYC-IBPB", "typename": "EPYC-IBPB-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "ibpb", @@ -40230,7 +40784,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -40243,17 +40796,13 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "avx512-bf16", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40281,7 +40830,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512ifma", "avx512cd", "sha-ni", @@ -40294,17 +40842,13 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "rdpid", "avx512-bf16", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "perfctr-core", "clzero", - "xsaveerptr", - "wbnoinvd", "ibpb", "ibrs", "amd-stibp", @@ -40329,11 +40873,9 @@ "name": "EPYC", "typename": "EPYC-x86_64-cpu", "unavailable-features": [ - "rdseed", "sha-ni", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "nrip-save", @@ -40348,10 +40890,8 @@ "name": "Dhyana-v2", "typename": "Dhyana-v2-x86_64-cpu", "unavailable-features": [ - "rdseed", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "ibpb", @@ -40367,10 +40907,8 @@ "name": "Dhyana-v1", "typename": "Dhyana-v1-x86_64-cpu", "unavailable-features": [ - "rdseed", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "ibpb", @@ -40385,10 +40923,8 @@ "name": "Dhyana", "typename": "Dhyana-x86_64-cpu", "unavailable-features": [ - "rdseed", "fxsr-opt", "misalignsse", - "3dnowprefetch", "osvw", "topoext", "ibpb", @@ -40406,16 +40942,12 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", "xsavec", - "xsaves", - "rdctl-no", - "skip-l1dfl-vmentry" + "xsaves" ], "static": false, "migration-safe": true, @@ -40427,15 +40959,11 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "skip-l1dfl-vmentry" + "xsavec" ], "static": false, "migration-safe": true, @@ -40447,15 +40975,11 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "skip-l1dfl-vmentry" + "xsavec" ], "static": false, "migration-safe": true, @@ -40467,15 +40991,11 @@ "unavailable-features": [ "x2apic", "tsc-deadline", - "rdseed", "sha-ni", "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "skip-l1dfl-vmentry" + "xsavec" ], "alias-of": "Denverton-v1", "static": false, @@ -40494,7 +41014,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40504,15 +41023,8 @@ "arch-capabilities", "ssbd", "avx512-bf16", - "3dnowprefetch", "xsavec", - "xsaves", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsaves" ], "static": false, "migration-safe": true, @@ -40530,7 +41042,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40540,14 +41051,7 @@ "arch-capabilities", "ssbd", "avx512-bf16", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -40565,7 +41069,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40575,14 +41078,7 @@ "arch-capabilities", "ssbd", "avx512-bf16", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no", - "pschange-mc-no", - "taa-no" + "xsavec" ], "alias-of": "Cooperlake-v1", "static": false, @@ -40618,7 +41114,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40626,13 +41121,8 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", "xsavec", - "xsaves", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no" + "xsaves" ], "static": false, "migration-safe": true, @@ -40648,7 +41138,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40656,12 +41145,7 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -40677,7 +41161,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40685,12 +41168,7 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -40708,7 +41186,6 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40716,12 +41193,7 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no" + "xsavec" ], "static": false, "migration-safe": true, @@ -40739,14 +41211,12 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "avx512vnni", "spec-ctrl", "ssbd", - "3dnowprefetch", "xsavec" ], "static": false, @@ -40763,7 +41233,6 @@ "invpcid", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", @@ -40771,12 +41240,7 @@ "spec-ctrl", "arch-capabilities", "ssbd", - "3dnowprefetch", - "xsavec", - "rdctl-no", - "ibrs-all", - "skip-l1dfl-vmentry", - "mds-no" + "xsavec" ], "alias-of": "Cascadelake-Server-v3", "static": false, @@ -40795,14 +41259,12 @@ "rtm", "avx512f", "avx512dq", - "rdseed", "avx512cd", "avx512bw", "avx512vl", "avx512vnni", "spec-ctrl", "ssbd", - "3dnowprefetch", "xsavec" ], "alias-of": "Cascadelake-Server-v1", @@ -40818,9 +41280,7 @@ "x2apic", "tsc-deadline", "invpcid", - "rdseed", - "spec-ctrl", - "3dnowprefetch" + "spec-ctrl" ], "static": false, "migration-safe": true, @@ -40836,9 +41296,7 @@ "hle", "invpcid", "rtm", - "rdseed", - "spec-ctrl", - "3dnowprefetch" + "spec-ctrl" ], "static": false, "migration-safe": true, @@ -40851,9 +41309,7 @@ "pcid", "x2apic", "tsc-deadline", - "invpcid", - "rdseed", - "3dnowprefetch" + "invpcid" ], "static": false, "migration-safe": true, @@ -40868,9 +41324,7 @@ "tsc-deadline", "hle", "invpcid", - "rtm", - "rdseed", - "3dnowprefetch" + "rtm" ], "static": false, "migration-safe": true, @@ -40884,9 +41338,7 @@ "x2apic", "tsc-deadline", "invpcid", - "rdseed", - "spec-ctrl", - "3dnowprefetch" + "spec-ctrl" ], "alias-of": "Broadwell-v4", "static": false, @@ -40900,9 +41352,7 @@ "pcid", "x2apic", "tsc-deadline", - "invpcid", - "rdseed", - "3dnowprefetch" + "invpcid" ], "alias-of": "Broadwell-v2", "static": false, @@ -40919,9 +41369,7 @@ "hle", "invpcid", "rtm", - "rdseed", - "spec-ctrl", - "3dnowprefetch" + "spec-ctrl" ], "alias-of": "Broadwell-v3", "static": false, @@ -40937,9 +41385,7 @@ "tsc-deadline", "hle", "invpcid", - "rtm", - "rdseed", - "3dnowprefetch" + "rtm" ], "alias-of": "Broadwell-v1", "static": false, @@ -40995,7 +41441,7 @@ "aes": true, "vmx-apicv-xapic": false, "mmx": true, - "rdpid": false, + "rdpid": true, "arat": true, "vmx-page-walk-4": false, "vmx-page-walk-5": false, @@ -41003,6 +41449,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": false, + "mcdt-no": false, "bus-lock-detect": false, "xsavec": false, "intel-pt": false, @@ -41031,7 +41478,7 @@ "vmx-ept-execonly": false, "vmx-exit-save-efer": false, "vmx-invept-all-context": false, - "wbnoinvd": false, + "wbnoinvd": true, "avx512f": false, "msr": true, "mce": true, @@ -41062,7 +41509,7 @@ "avx512-vpopcntdq": false, "phe": false, "extapic": false, - "3dnowprefetch": false, + "3dnowprefetch": true, "vmx-vmfunc": false, "vmx-activity-shutdown": false, "sgx1": false, @@ -41132,6 +41579,7 @@ "vmx-tsc-offset": false, "kvm-nopiodelay": false, "tm": false, + "fbsdp-no": false, "kvmclock-stable-bit": false, "vmx-rdtsc-exit": false, "hypervisor": true, @@ -41159,6 +41607,7 @@ "cldemote": false, "sgx-tokenkey": false, "vmx-ept": false, + "pbrsb-no": false, "xfd": false, "kvm-mmu": false, "sse4.2": true, @@ -41214,6 +41663,7 @@ "tsc-adjust": false, "vnmi": false, "kvm-steal-time": false, + "psdp-no": false, "avx512-vp2intersect": false, "kvmclock": false, "vmx-zero-len-inject": false, @@ -41253,6 +41703,7 @@ "fsrm": true, "fsrs": true, "fsrc": true, + "sbdr-ssdp-no": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, "umip": true, @@ -41306,7 +41757,7 @@ "lmce": false, "perfctr-nb": false, "rdrand": true, - "rdseed": false, + "rdseed": true, "cmpccxadd": false, "avx512-4vnniw": false, "vme": false, @@ -41314,7 +41765,7 @@ "dtes64": false, "mtrr": true, "rdtscp": true, - "xsaveerptr": false, + "xsaveerptr": true, "pse36": true, "kvm-pv-tlb-flush": false, "vmx-activity-wait-sipi": false, @@ -41367,7 +41818,7 @@ "aes": true, "vmx-apicv-xapic": false, "mmx": true, - "rdpid": false, + "rdpid": true, "arat": true, "vmx-page-walk-4": false, "vmx-page-walk-5": false, @@ -41375,6 +41826,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": false, + "mcdt-no": false, "bus-lock-detect": false, "xsavec": false, "intel-pt": false, @@ -41403,7 +41855,7 @@ "vmx-ept-execonly": false, "vmx-exit-save-efer": false, "vmx-invept-all-context": false, - "wbnoinvd": false, + "wbnoinvd": true, "avx512f": false, "msr": true, "mce": true, @@ -41434,7 +41886,7 @@ "avx512-vpopcntdq": false, "phe": false, "extapic": false, - "3dnowprefetch": false, + "3dnowprefetch": true, "vmx-vmfunc": false, "vmx-activity-shutdown": false, "sgx1": false, @@ -41504,6 +41956,7 @@ "vmx-tsc-offset": false, "kvm-nopiodelay": false, "tm": false, + "fbsdp-no": false, "kvmclock-stable-bit": false, "vmx-rdtsc-exit": false, "hypervisor": true, @@ -41531,6 +41984,7 @@ "cldemote": false, "sgx-tokenkey": false, "vmx-ept": false, + "pbrsb-no": false, "xfd": false, "kvm-mmu": false, "sse4.2": true, @@ -41586,6 +42040,7 @@ "tsc-adjust": false, "vnmi": false, "kvm-steal-time": false, + "psdp-no": false, "avx512-vp2intersect": false, "kvmclock": false, "vmx-zero-len-inject": false, @@ -41625,6 +42080,7 @@ "fsrm": true, "fsrs": true, "fsrc": true, + "sbdr-ssdp-no": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, "umip": true, @@ -41678,7 +42134,7 @@ "lmce": false, "perfctr-nb": false, "rdrand": true, - "rdseed": false, + "rdseed": true, "cmpccxadd": false, "avx512-4vnniw": false, "vme": false, @@ -41686,7 +42142,7 @@ "dtes64": false, "mtrr": true, "rdtscp": true, - "xsaveerptr": false, + "xsaveerptr": true, "pse36": true, "kvm-pv-tlb-flush": false, "vmx-activity-wait-sipi": false, @@ -41843,7 +42299,7 @@ "numa-mem-supported": false, "default-cpu-type": "qemu64-x86_64-cpu", "acpi": true, - "cpu-max": 288, + "cpu-max": 1024, "deprecated": false, "default-ram-id": "pc.ram", "alias": "q35" diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index 475496a8c8..d61720468a 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -209,7 +209,7 @@ <flag name='run-with.async-teardown'/> <version>8000050</version> <microcodeVersion>43100245</microcodeVersion> - <package>v8.0.0-1739-g5f9dd6a8ce</package> + <package>v8.0.0-2835-g361d539735</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='avx-ne-convert' type='boolean' value='false'/> @@ -230,6 +230,7 @@ <property name='ibrs-all' type='boolean' value='false'/> <property name='vmx-desc-exit' type='boolean' value='false'/> <property name='pause-filter' type='boolean' value='true' migratable='yes'/> + <property name='mcdt-no' type='boolean' value='false'/> <property name='bus-lock-detect' type='boolean' value='false'/> <property name='xsavec' type='boolean' value='true' migratable='yes'/> <property name='intel-pt' type='boolean' value='false'/> @@ -359,6 +360,7 @@ <property name='vmx-tsc-offset' type='boolean' value='false'/> <property name='kvm-nopiodelay' type='boolean' value='true' migratable='yes'/> <property name='tm' type='boolean' value='false'/> + <property name='fbsdp-no' type='boolean' value='false'/> <property name='kvmclock-stable-bit' type='boolean' value='true' migratable='yes'/> <property name='vmx-rdtsc-exit' type='boolean' value='false'/> <property name='hypervisor' type='boolean' value='true' migratable='yes'/> @@ -386,6 +388,7 @@ <property name='cldemote' type='boolean' value='false'/> <property name='sgx-tokenkey' type='boolean' value='false'/> <property name='vmx-ept' type='boolean' value='false'/> + <property name='pbrsb-no' type='boolean' value='false'/> <property name='xfd' type='boolean' value='false'/> <property name='kvm-mmu' type='boolean' value='false'/> <property name='sse4.2' type='boolean' value='true' migratable='yes'/> @@ -441,6 +444,7 @@ <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/> <property name='vnmi' type='boolean' value='false'/> <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/> + <property name='psdp-no' type='boolean' value='false'/> <property name='avx512-vp2intersect' type='boolean' value='false'/> <property name='kvmclock' type='boolean' value='true' migratable='yes'/> <property name='vmx-zero-len-inject' type='boolean' value='false'/> @@ -480,6 +484,7 @@ <property name='fsrm' type='boolean' value='false'/> <property name='fsrs' type='boolean' value='false'/> <property name='fsrc' type='boolean' value='false'/> + <property name='sbdr-ssdp-no' type='boolean' value='false'/> <property name='vmx-entry-load-perf-global-ctrl' type='boolean' value='false'/> <property name='vmx-io-bitmap' type='boolean' value='false'/> <property name='umip' type='boolean' value='true' migratable='yes'/> @@ -859,6 +864,56 @@ <blocker name='invpcid'/> <blocker name='rtm'/> </cpu> + <cpu type='kvm' name='SapphireRapids-v2' typename='SapphireRapids-v2-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='hle'/> + <blocker name='erms'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='pku'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vaes'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='la57'/> + <blocker name='bus-lock-detect'/> + <blocker name='fsrm'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='fzrm'/> + <blocker name='fsrs'/> + <blocker name='fsrc'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='pku'/> + <blocker name='amx-tile'/> + <blocker name='amx-tile'/> + <blocker name='ibrs-all'/> + <blocker name='taa-no'/> + <blocker name='sbdr-ssdp-no'/> + <blocker name='fbsdp-no'/> + <blocker name='psdp-no'/> + </cpu> <cpu type='kvm' name='SapphireRapids-v1' typename='SapphireRapids-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='hle'/> @@ -1309,6 +1364,114 @@ <blocker name='invpcid'/> <blocker name='rtm'/> </cpu> + <cpu type='kvm' name='GraniteRapids-v1' typename='GraniteRapids-v1-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='hle'/> + <blocker name='erms'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='pku'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vaes'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='la57'/> + <blocker name='bus-lock-detect'/> + <blocker name='fsrm'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='fzrm'/> + <blocker name='fsrs'/> + <blocker name='fsrc'/> + <blocker name='amx-fp16'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='pku'/> + <blocker name='amx-tile'/> + <blocker name='amx-tile'/> + <blocker name='ibrs-all'/> + <blocker name='taa-no'/> + <blocker name='sbdr-ssdp-no'/> + <blocker name='fbsdp-no'/> + <blocker name='psdp-no'/> + <blocker name='pbrsb-no'/> + <blocker name='prefetchiti'/> + <blocker name='mcdt-no'/> + </cpu> + <cpu type='kvm' name='GraniteRapids' typename='GraniteRapids-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='hle'/> + <blocker name='erms'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='pku'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vaes'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='la57'/> + <blocker name='bus-lock-detect'/> + <blocker name='fsrm'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='fzrm'/> + <blocker name='fsrs'/> + <blocker name='fsrc'/> + <blocker name='amx-fp16'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='avx512f'/> + <blocker name='pku'/> + <blocker name='amx-tile'/> + <blocker name='amx-tile'/> + <blocker name='ibrs-all'/> + <blocker name='taa-no'/> + <blocker name='sbdr-ssdp-no'/> + <blocker name='fbsdp-no'/> + <blocker name='psdp-no'/> + <blocker name='pbrsb-no'/> + <blocker name='prefetchiti'/> + <blocker name='mcdt-no'/> + </cpu> <cpu type='kvm' name='EPYC-v4' typename='EPYC-v4-x86_64-cpu' usable='no'> <blocker name='xsaves'/> </cpu> @@ -1732,7 +1895,7 @@ <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> <machine type='kvm' name='pc-q35-7.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> - <machine type='kvm' name='pc-q35-8.1' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> + <machine type='kvm' name='pc-q35-8.1' alias='q35' hotplugCpus='yes' maxCpus='1024' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> <machine type='kvm' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> @@ -1792,7 +1955,7 @@ <property name='aes' type='boolean' value='true' migratable='yes'/> <property name='vmx-apicv-xapic' type='boolean' value='false'/> <property name='mmx' type='boolean' value='true' migratable='yes'/> - <property name='rdpid' type='boolean' value='false'/> + <property name='rdpid' type='boolean' value='true' migratable='yes'/> <property name='arat' type='boolean' value='true' migratable='yes'/> <property name='vmx-page-walk-4' type='boolean' value='false'/> <property name='vmx-page-walk-5' type='boolean' value='false'/> @@ -1800,6 +1963,7 @@ <property name='ibrs-all' type='boolean' value='false'/> <property name='vmx-desc-exit' type='boolean' value='false'/> <property name='pause-filter' type='boolean' value='false'/> + <property name='mcdt-no' type='boolean' value='false'/> <property name='bus-lock-detect' type='boolean' value='false'/> <property name='xsavec' type='boolean' value='false'/> <property name='intel-pt' type='boolean' value='false'/> @@ -1828,7 +1992,7 @@ <property name='vmx-ept-execonly' type='boolean' value='false'/> <property name='vmx-exit-save-efer' type='boolean' value='false'/> <property name='vmx-invept-all-context' type='boolean' value='false'/> - <property name='wbnoinvd' type='boolean' value='false'/> + <property name='wbnoinvd' type='boolean' value='true' migratable='yes'/> <property name='avx512f' type='boolean' value='false'/> <property name='msr' type='boolean' value='true' migratable='yes'/> <property name='mce' type='boolean' value='true' migratable='yes'/> @@ -1859,7 +2023,7 @@ <property name='avx512-vpopcntdq' type='boolean' value='false'/> <property name='phe' type='boolean' value='false'/> <property name='extapic' type='boolean' value='false'/> - <property name='3dnowprefetch' type='boolean' value='false'/> + <property name='3dnowprefetch' type='boolean' value='true' migratable='yes'/> <property name='vmx-vmfunc' type='boolean' value='false'/> <property name='vmx-activity-shutdown' type='boolean' value='false'/> <property name='sgx1' type='boolean' value='false'/> @@ -1929,6 +2093,7 @@ <property name='vmx-tsc-offset' type='boolean' value='false'/> <property name='kvm-nopiodelay' type='boolean' value='false'/> <property name='tm' type='boolean' value='false'/> + <property name='fbsdp-no' type='boolean' value='false'/> <property name='kvmclock-stable-bit' type='boolean' value='false'/> <property name='vmx-rdtsc-exit' type='boolean' value='false'/> <property name='hypervisor' type='boolean' value='true' migratable='yes'/> @@ -1956,6 +2121,7 @@ <property name='cldemote' type='boolean' value='false'/> <property name='sgx-tokenkey' type='boolean' value='false'/> <property name='vmx-ept' type='boolean' value='false'/> + <property name='pbrsb-no' type='boolean' value='false'/> <property name='xfd' type='boolean' value='false'/> <property name='kvm-mmu' type='boolean' value='false'/> <property name='sse4.2' type='boolean' value='true' migratable='yes'/> @@ -2011,6 +2177,7 @@ <property name='tsc-adjust' type='boolean' value='false'/> <property name='vnmi' type='boolean' value='false'/> <property name='kvm-steal-time' type='boolean' value='false'/> + <property name='psdp-no' type='boolean' value='false'/> <property name='avx512-vp2intersect' type='boolean' value='false'/> <property name='kvmclock' type='boolean' value='false'/> <property name='vmx-zero-len-inject' type='boolean' value='false'/> @@ -2050,6 +2217,7 @@ <property name='fsrm' type='boolean' value='true' migratable='yes'/> <property name='fsrs' type='boolean' value='true' migratable='yes'/> <property name='fsrc' type='boolean' value='true' migratable='yes'/> + <property name='sbdr-ssdp-no' type='boolean' value='false'/> <property name='vmx-entry-load-perf-global-ctrl' type='boolean' value='false'/> <property name='vmx-io-bitmap' type='boolean' value='false'/> <property name='umip' type='boolean' value='true' migratable='yes'/> @@ -2103,7 +2271,7 @@ <property name='lmce' type='boolean' value='false'/> <property name='perfctr-nb' type='boolean' value='false'/> <property name='rdrand' type='boolean' value='true' migratable='yes'/> - <property name='rdseed' type='boolean' value='false'/> + <property name='rdseed' type='boolean' value='true' migratable='yes'/> <property name='cmpccxadd' type='boolean' value='false'/> <property name='avx512-4vnniw' type='boolean' value='false'/> <property name='vme' type='boolean' value='false'/> @@ -2111,7 +2279,7 @@ <property name='dtes64' type='boolean' value='false'/> <property name='mtrr' type='boolean' value='true' migratable='yes'/> <property name='rdtscp' type='boolean' value='true' migratable='yes'/> - <property name='xsaveerptr' type='boolean' value='false'/> + <property name='xsaveerptr' type='boolean' value='true' migratable='yes'/> <property name='pse36' type='boolean' value='true' migratable='yes'/> <property name='kvm-pv-tlb-flush' type='boolean' value='false'/> <property name='vmx-activity-wait-sipi' type='boolean' value='false'/> @@ -2174,7 +2342,6 @@ <cpu type='tcg' name='Snowridge-v4' typename='Snowridge-v4-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='gfni'/> <blocker name='cldemote'/> @@ -2183,14 +2350,12 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='Snowridge-v3' typename='Snowridge-v3-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='gfni'/> <blocker name='cldemote'/> @@ -2200,7 +2365,6 @@ <blocker name='arch-capabilities'/> <blocker name='core-capability'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> <blocker name='split-lock-detect'/> @@ -2208,7 +2372,6 @@ <cpu type='tcg' name='Snowridge-v2' typename='Snowridge-v2-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='gfni'/> <blocker name='cldemote'/> @@ -2218,14 +2381,12 @@ <blocker name='arch-capabilities'/> <blocker name='core-capability'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='split-lock-detect'/> </cpu> <cpu type='tcg' name='Snowridge-v1' typename='Snowridge-v1-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='gfni'/> <blocker name='cldemote'/> @@ -2235,14 +2396,12 @@ <blocker name='arch-capabilities'/> <blocker name='core-capability'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='split-lock-detect'/> </cpu> <cpu type='tcg' name='Snowridge' typename='Snowridge-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='gfni'/> <blocker name='cldemote'/> @@ -2252,7 +2411,6 @@ <blocker name='arch-capabilities'/> <blocker name='core-capability'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='split-lock-detect'/> </cpu> @@ -2263,12 +2421,10 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> </cpu> @@ -2279,12 +2435,10 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server-v3' typename='Skylake-Server-v3-x86_64-cpu' usable='no'> @@ -2294,12 +2448,10 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server-v2' typename='Skylake-Server-v2-x86_64-cpu' usable='no'> @@ -2311,12 +2463,10 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server-v1' typename='Skylake-Server-v1-x86_64-cpu' usable='no'> @@ -2328,11 +2478,9 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server-noTSX-IBRS' typename='Skylake-Server-noTSX-IBRS-x86_64-cpu' usable='no'> @@ -2342,12 +2490,10 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'> @@ -2359,12 +2505,10 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'> @@ -2376,11 +2520,9 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client-v4' typename='Skylake-Client-v4-x86_64-cpu' usable='no'> @@ -2388,9 +2530,7 @@ <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> </cpu> @@ -2399,9 +2539,7 @@ <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client-v2' typename='Skylake-Client-v2-x86_64-cpu' usable='no'> @@ -2411,9 +2549,7 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client-v1' typename='Skylake-Client-v1-x86_64-cpu' usable='no'> @@ -2423,8 +2559,6 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client-noTSX-IBRS' typename='Skylake-Client-noTSX-IBRS-x86_64-cpu' usable='no'> @@ -2432,9 +2566,7 @@ <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'> @@ -2444,9 +2576,7 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'> @@ -2456,10 +2586,45 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> + <cpu type='tcg' name='SapphireRapids-v2' typename='SapphireRapids-v2-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='x2apic'/> + <blocker name='tsc-deadline'/> + <blocker name='hle'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='sha-ni'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='bus-lock-detect'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='arch-capabilities'/> + <blocker name='ssbd'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='xsavec'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + </cpu> <cpu type='tcg' name='SapphireRapids-v1' typename='SapphireRapids-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='x2apic'/> @@ -2469,7 +2634,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -2482,7 +2646,6 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='bus-lock-detect'/> <blocker name='serialize'/> <blocker name='tsx-ldtrk'/> @@ -2495,17 +2658,9 @@ <blocker name='ssbd'/> <blocker name='avx-vnni'/> <blocker name='avx512-bf16'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> <blocker name='xsaves'/> <blocker name='xfd'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='SapphireRapids' typename='SapphireRapids-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -2516,7 +2671,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -2529,7 +2683,6 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='bus-lock-detect'/> <blocker name='serialize'/> <blocker name='tsx-ldtrk'/> @@ -2542,17 +2695,9 @@ <blocker name='ssbd'/> <blocker name='avx-vnni'/> <blocker name='avx512-bf16'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> <blocker name='xsaves'/> <blocker name='xfd'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='SandyBridge-v2' typename='SandyBridge-v2-x86_64-cpu' usable='no'> <blocker name='x2apic'/> @@ -2576,7 +2721,6 @@ <cpu type='tcg' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/> <cpu type='tcg' name='Opteron_G5-v1' typename='Opteron_G5-v1-x86_64-cpu' usable='no'> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='xop'/> <blocker name='fma4'/> <blocker name='tbm'/> @@ -2584,7 +2728,6 @@ </cpu> <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='xop'/> <blocker name='fma4'/> <blocker name='tbm'/> @@ -2592,14 +2735,12 @@ </cpu> <cpu type='tcg' name='Opteron_G4-v1' typename='Opteron_G4-v1-x86_64-cpu' usable='no'> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='xop'/> <blocker name='fma4'/> <blocker name='nrip-save'/> </cpu> <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='xop'/> <blocker name='fma4'/> <blocker name='nrip-save'/> @@ -2626,27 +2767,23 @@ <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='avx512f'/> - <blocker name='rdseed'/> <blocker name='avx512pf'/> <blocker name='avx512er'/> <blocker name='avx512cd'/> <blocker name='avx512-vpopcntdq'/> <blocker name='avx512-4vnniw'/> <blocker name='avx512-4fmaps'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='avx512f'/> - <blocker name='rdseed'/> <blocker name='avx512pf'/> <blocker name='avx512er'/> <blocker name='avx512cd'/> <blocker name='avx512-vpopcntdq'/> <blocker name='avx512-4vnniw'/> <blocker name='avx512-4fmaps'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='IvyBridge-v2' typename='IvyBridge-v2-x86_64-cpu' usable='no'> <blocker name='x2apic'/> @@ -2673,7 +2810,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -2686,20 +2822,11 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> <blocker name='xsaves'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Icelake-Server-v5' typename='Icelake-Server-v5-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -2708,7 +2835,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -2721,20 +2847,11 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> <blocker name='xsaves'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Icelake-Server-v4' typename='Icelake-Server-v4-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -2743,7 +2860,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -2756,19 +2872,10 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Icelake-Server-v3' typename='Icelake-Server-v3-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -2777,7 +2884,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -2791,15 +2897,7 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Icelake-Server-v2' typename='Icelake-Server-v2-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -2808,7 +2906,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -2821,8 +2918,6 @@ <blocker name='avx512-vpopcntdq'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Icelake-Server-v1' typename='Icelake-Server-v1-x86_64-cpu' usable='no'> @@ -2834,7 +2929,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -2847,8 +2941,6 @@ <blocker name='avx512-vpopcntdq'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Icelake-Server-noTSX' typename='Icelake-Server-noTSX-x86_64-cpu' usable='no'> @@ -2858,7 +2950,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -2871,8 +2962,6 @@ <blocker name='avx512-vpopcntdq'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'> @@ -2884,7 +2973,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -2897,8 +2985,6 @@ <blocker name='avx512-vpopcntdq'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> - <blocker name='wbnoinvd'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Haswell-v4' typename='Haswell-v4-x86_64-cpu' usable='no'> @@ -2961,44 +3047,116 @@ <blocker name='invpcid'/> <blocker name='rtm'/> </cpu> + <cpu type='tcg' name='GraniteRapids-v1' typename='GraniteRapids-v1-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='x2apic'/> + <blocker name='tsc-deadline'/> + <blocker name='hle'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='sha-ni'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='bus-lock-detect'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='arch-capabilities'/> + <blocker name='ssbd'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='amx-fp16'/> + <blocker name='xsavec'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + <blocker name='prefetchiti'/> + <blocker name='mcdt-no'/> + </cpu> + <cpu type='tcg' name='GraniteRapids' typename='GraniteRapids-x86_64-cpu' usable='no'> + <blocker name='pcid'/> + <blocker name='x2apic'/> + <blocker name='tsc-deadline'/> + <blocker name='hle'/> + <blocker name='invpcid'/> + <blocker name='rtm'/> + <blocker name='avx512f'/> + <blocker name='avx512dq'/> + <blocker name='avx512ifma'/> + <blocker name='avx512cd'/> + <blocker name='sha-ni'/> + <blocker name='avx512bw'/> + <blocker name='avx512vl'/> + <blocker name='avx512vbmi'/> + <blocker name='avx512vbmi2'/> + <blocker name='gfni'/> + <blocker name='vpclmulqdq'/> + <blocker name='avx512vnni'/> + <blocker name='avx512bitalg'/> + <blocker name='avx512-vpopcntdq'/> + <blocker name='bus-lock-detect'/> + <blocker name='serialize'/> + <blocker name='tsx-ldtrk'/> + <blocker name='amx-bf16'/> + <blocker name='avx512-fp16'/> + <blocker name='amx-tile'/> + <blocker name='amx-int8'/> + <blocker name='spec-ctrl'/> + <blocker name='arch-capabilities'/> + <blocker name='ssbd'/> + <blocker name='avx-vnni'/> + <blocker name='avx512-bf16'/> + <blocker name='amx-fp16'/> + <blocker name='xsavec'/> + <blocker name='xsaves'/> + <blocker name='xfd'/> + <blocker name='prefetchiti'/> + <blocker name='mcdt-no'/> + </cpu> <cpu type='tcg' name='EPYC-v4' typename='EPYC-v4-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> <blocker name='ibpb'/> <blocker name='nrip-save'/> <blocker name='xsavec'/> <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-v3' typename='EPYC-v3-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> <blocker name='ibpb'/> <blocker name='nrip-save'/> <blocker name='xsavec'/> <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-v2' typename='EPYC-v2-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='ibpb'/> @@ -3006,29 +3164,22 @@ <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='EPYC-v1' typename='EPYC-v1-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='nrip-save'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='EPYC-Rome-v4' typename='EPYC-Rome-v4-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3037,18 +3188,13 @@ <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='EPYC-Rome-v3' typename='EPYC-Rome-v3-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3058,18 +3204,13 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-Rome-v2' typename='EPYC-Rome-v2-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3079,18 +3220,13 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-Rome-v1' typename='EPYC-Rome-v1-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='amd-stibp'/> <blocker name='nrip-save'/> @@ -3098,18 +3234,13 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-Rome' typename='EPYC-Rome-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='amd-stibp'/> <blocker name='nrip-save'/> @@ -3119,19 +3250,14 @@ <cpu type='tcg' name='EPYC-Milan-v2' typename='EPYC-Milan-v2-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='vpclmulqdq'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3148,18 +3274,13 @@ <cpu type='tcg' name='EPYC-Milan-v1' typename='EPYC-Milan-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3171,18 +3292,13 @@ <cpu type='tcg' name='EPYC-Milan' typename='EPYC-Milan-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3192,11 +3308,9 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='ibpb'/> @@ -3208,7 +3322,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -3221,17 +3334,13 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='avx512-bf16'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3252,7 +3361,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512ifma'/> <blocker name='avx512cd'/> <blocker name='sha-ni'/> @@ -3265,17 +3373,13 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='rdpid'/> <blocker name='avx512-bf16'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='perfctr-core'/> <blocker name='clzero'/> - <blocker name='xsaveerptr'/> - <blocker name='wbnoinvd'/> <blocker name='ibpb'/> <blocker name='ibrs'/> <blocker name='amd-stibp'/> @@ -3292,21 +3396,17 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='nrip-save'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Dhyana-v2' typename='Dhyana-v2-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='ibpb'/> @@ -3315,10 +3415,8 @@ <blocker name='xsaves'/> </cpu> <cpu type='tcg' name='Dhyana-v1' typename='Dhyana-v1-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='ibpb'/> @@ -3326,10 +3424,8 @@ <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Dhyana' typename='Dhyana-x86_64-cpu' usable='no'> - <blocker name='rdseed'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> - <blocker name='3dnowprefetch'/> <blocker name='osvw'/> <blocker name='topoext'/> <blocker name='ibpb'/> @@ -3339,55 +3435,39 @@ <cpu type='tcg' name='Denverton-v3' typename='Denverton-v3-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> - <blocker name='rdctl-no'/> - <blocker name='skip-l1dfl-vmentry'/> </cpu> <cpu type='tcg' name='Denverton-v2' typename='Denverton-v2-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='skip-l1dfl-vmentry'/> </cpu> <cpu type='tcg' name='Denverton-v1' typename='Denverton-v1-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='skip-l1dfl-vmentry'/> </cpu> <cpu type='tcg' name='Denverton' typename='Denverton-x86_64-cpu' usable='no'> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> - <blocker name='rdseed'/> <blocker name='sha-ni'/> <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='skip-l1dfl-vmentry'/> </cpu> <cpu type='tcg' name='Cooperlake-v2' typename='Cooperlake-v2-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3398,7 +3478,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3408,15 +3487,8 @@ <blocker name='arch-capabilities'/> <blocker name='ssbd'/> <blocker name='avx512-bf16'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Cooperlake-v1' typename='Cooperlake-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3427,7 +3499,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3437,14 +3508,7 @@ <blocker name='arch-capabilities'/> <blocker name='ssbd'/> <blocker name='avx512-bf16'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Cooperlake' typename='Cooperlake-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3455,7 +3519,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3465,14 +3528,7 @@ <blocker name='arch-capabilities'/> <blocker name='ssbd'/> <blocker name='avx512-bf16'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> - <blocker name='pschange-mc-no'/> - <blocker name='taa-no'/> </cpu> <cpu type='tcg' name='Conroe-v1' typename='Conroe-v1-x86_64-cpu' usable='yes'/> <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/> @@ -3483,7 +3539,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3491,13 +3546,8 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xsaves'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> </cpu> <cpu type='tcg' name='Cascadelake-Server-v4' typename='Cascadelake-Server-v4-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3506,7 +3556,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3514,12 +3563,7 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> </cpu> <cpu type='tcg' name='Cascadelake-Server-v3' typename='Cascadelake-Server-v3-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3528,7 +3572,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3536,12 +3579,7 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> </cpu> <cpu type='tcg' name='Cascadelake-Server-v2' typename='Cascadelake-Server-v2-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3552,7 +3590,6 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3560,12 +3597,7 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> </cpu> <cpu type='tcg' name='Cascadelake-Server-v1' typename='Cascadelake-Server-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3576,14 +3608,12 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='avx512vnni'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Cascadelake-Server-noTSX' typename='Cascadelake-Server-noTSX-x86_64-cpu' usable='no'> @@ -3593,7 +3623,6 @@ <blocker name='invpcid'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> @@ -3601,12 +3630,7 @@ <blocker name='spec-ctrl'/> <blocker name='arch-capabilities'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> - <blocker name='rdctl-no'/> - <blocker name='ibrs-all'/> - <blocker name='skip-l1dfl-vmentry'/> - <blocker name='mds-no'/> </cpu> <cpu type='tcg' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3617,14 +3641,12 @@ <blocker name='rtm'/> <blocker name='avx512f'/> <blocker name='avx512dq'/> - <blocker name='rdseed'/> <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='avx512vnni'/> <blocker name='spec-ctrl'/> <blocker name='ssbd'/> - <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> </cpu> <cpu type='tcg' name='Broadwell-v4' typename='Broadwell-v4-x86_64-cpu' usable='no'> @@ -3632,9 +3654,7 @@ <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-v3' typename='Broadwell-v3-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3643,17 +3663,13 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-v2' typename='Broadwell-v2-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-v1' typename='Broadwell-v1-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3662,25 +3678,19 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='x2apic'/> <blocker name='tsc-deadline'/> <blocker name='invpcid'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3689,9 +3699,7 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> <blocker name='spec-ctrl'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -3700,8 +3708,6 @@ <blocker name='hle'/> <blocker name='invpcid'/> <blocker name='rtm'/> - <blocker name='rdseed'/> - <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> @@ -3718,7 +3724,7 @@ <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> <machine type='tcg' name='pc-q35-7.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> - <machine type='tcg' name='pc-q35-8.1' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> + <machine type='tcg' name='pc-q35-8.1' alias='q35' hotplugCpus='yes' maxCpus='1024' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> <machine type='tcg' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/> <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' acpi='yes'/> -- 2.41.0

2 1

[PATCH 0/2] storage: Fix returning of locked objects from 'virStoragePoolObjListSearch'
by Peter Krempa 18 Jul '23

18 Jul '23

Patch 1 improves chances to reproduce the bug. https://bugzilla.redhat.com/show_bug.cgi?id=2222210 Peter Krempa (2): file reproducer storage: Fix returning of locked objects from 'virStoragePoolObjListSearch' src/conf/virstorageobj.c | 7 ++++++- src/storage/storage_util.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) -- 2.41.0

2 3

[PATCH] conf: domcaps: Add 'async-teardown' domain capability
by Boris Fiuczynski 18 Jul '23

18 Jul '23

Add async-teardown to the features list in domain capabilities allowing high level management to introspect the availability of the asynchronous teardown feature. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- docs/formatdomaincaps.rst | 6 ++++++ src/conf/domain_capabilities.c | 1 + src/conf/domain_capabilities.h | 1 + src/conf/schemas/domaincaps.rng | 9 +++++++++ src/qemu/qemu_capabilities.c | 1 + tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml | 1 + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml | 1 + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 1 + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.2.0.ppc.xml | 1 + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml | 1 + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.1.0.s390x.xml | 1 + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 1 + 74 files changed, 87 insertions(+) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index 9dae941d18..0f8015d4dd 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -647,6 +647,7 @@ capabilities. All features occur as children of the main ``features`` element. <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='yes'/> <sev> <cbitpos>47</cbitpos> <reduced-phys-bits>1</reduced-phys-bits> @@ -711,6 +712,11 @@ presence of the ``backup`` element even if ``supported='no'`` implies that the ``VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA`` flag for ``virDomainUndefine`` is supported. +async-teardown +^^^^^^^^^^^^^^ + +Reports whether the asynchronous teardown feature can be enabled. + s390-pv capability ^^^^^^^^^^^^^^^^^^ diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index c076af7808..2fa5756184 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -40,6 +40,7 @@ VIR_ENUM_IMPL(virDomainCapsFeature, "genid", "backingStoreInput", "backup", + "async-teardown", "s390-pv", ); diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index 2624269eab..01bcfa2e39 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -248,6 +248,7 @@ typedef enum { VIR_DOMAIN_CAPS_FEATURE_GENID, VIR_DOMAIN_CAPS_FEATURE_BACKING_STORE_INPUT, VIR_DOMAIN_CAPS_FEATURE_BACKUP, + VIR_DOMAIN_CAPS_FEATURE_ASYNC_TEARDOWN, VIR_DOMAIN_CAPS_FEATURE_S390_PV, VIR_DOMAIN_CAPS_FEATURE_LAST diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng index 19bd6f7128..99ef148d44 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -300,6 +300,9 @@ <optional> <ref name="backup"/> </optional> + <optional> + <ref name="async-teardown"/> + </optional> <optional> <ref name="s390-pv"/> </optional> @@ -315,6 +318,12 @@ </element> </define> + <define name="async-teardown"> + <element name="async-teardown"> + <ref name="supported"/> + </element> + </define> + <define name="gic"> <element name="gic"> <ref name="supported"/> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c9f4b17208..338608f0a2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6296,6 +6296,7 @@ static const struct virQEMUCapsDomainFeatureCapabilityTuple domCapsTuples[] = { { VIR_DOMAIN_CAPS_FEATURE_GENID, QEMU_CAPS_DEVICE_VMGENID }, { VIR_DOMAIN_CAPS_FEATURE_BACKING_STORE_INPUT, QEMU_CAPS_LAST }, { VIR_DOMAIN_CAPS_FEATURE_BACKUP, QEMU_CAPS_INCREMENTAL_BACKUP }, + { VIR_DOMAIN_CAPS_FEATURE_ASYNC_TEARDOWN, QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN }, }; diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml index f408c2a969..f6c9622a56 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -248,6 +248,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml index 4427634d7c..3e9485c7d0 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -262,6 +262,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml index 981a06856d..9aa1d946ae 100644 --- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml @@ -194,6 +194,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml index 981a06856d..9aa1d946ae 100644 --- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml @@ -194,6 +194,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml index a3289573bd..770a67bff1 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -162,6 +162,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml index c35bed1326..da271825f9 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -268,6 +268,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <s390-pv supported='no'/> <sev supported='no'/> <sgx supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml index cbe083f1f1..513ca3caf4 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -248,6 +248,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index 6b68d4f2a5..64a6b7dea7 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -250,6 +250,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml index 20a8c9a583..7ee0dcf664 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml @@ -147,6 +147,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml index 39b1b4c1f2..95366f3edf 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -264,6 +264,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml index f84aec44c9..c8cd609bc8 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -207,6 +207,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml index 833cb4bb2e..1f0fc66f53 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml @@ -150,6 +150,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml index f84aec44c9..c8cd609bc8 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -207,6 +207,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml index 4b3f490942..c80fbb8ec6 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -169,6 +169,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index 603d842dfe..c8338b0889 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -250,6 +250,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml index cdbbe86ede..3f170d469f 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -251,6 +251,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml index 8950900e72..097ffce9f9 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -264,6 +264,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsdata/qemu_5.1.0.sparc.xml index 6f92de2b6c..7a04ea6c12 100644 --- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml +++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml @@ -133,6 +133,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml index 1ef28a71e4..ba0785dcf9 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -251,6 +251,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 46a3a44cdd..1474488d7b 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -251,6 +251,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml index 20a8c9a583..7ee0dcf664 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml @@ -147,6 +147,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index edb622240e..ec89689a36 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -264,6 +264,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml index af01bdfbe9..a36255f6f8 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -207,6 +207,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml index 833cb4bb2e..1f0fc66f53 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml @@ -150,6 +150,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml index af01bdfbe9..a36255f6f8 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -207,6 +207,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml index b465ad1030..538b790ba3 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -169,6 +169,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml index 9dbf118713..99faaad866 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -270,6 +270,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <s390-pv supported='no'/> <sev supported='no'/> <sgx supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 09db834535..1b4f379bbb 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -251,6 +251,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index b1a2be10e6..b8e9a26e68 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -253,6 +253,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='yes'> <cbitpos>47</cbitpos> <reducedPhysBits>1</reducedPhysBits> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 29b95a836f..2b99ae36b6 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -267,6 +267,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='yes'> <cbitpos>47</cbitpos> <reducedPhysBits>1</reducedPhysBits> diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml index 67889c4572..010fc6916e 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -209,6 +209,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml index 67889c4572..010fc6916e 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -209,6 +209,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml index f0a8b196f5..df3708f801 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -271,6 +271,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <s390-pv supported='yes'/> <sev supported='no'/> <sgx supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 693ae0a7f1..652cc0ef8d 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -253,6 +253,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='no'/> + <async-teardown supported='no'/> <sev supported='yes'> <cbitpos>47</cbitpos> <reducedPhysBits>1</reducedPhysBits> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index a161d6aa20..628684c171 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 7bfe6f802c..ab0aae0439 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -267,6 +267,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 8c4f8cc860..8f1a0bcb29 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 0449f562df..50be45c069 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index f15111c590..a670f306dd 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -269,6 +269,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml index 241e893df6..424f7cf606 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -216,6 +216,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml index 241e893df6..424f7cf606 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -216,6 +216,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml index a9f7aefbc9..94edf1878e 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -168,6 +168,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index fa1f7a2316..6cd7ac6616 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml b/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml index bcabf66d2a..d51de8273f 100644 --- a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml @@ -170,6 +170,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index e793278d41..e5f05ab1a7 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -255,6 +255,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='yes'> <flc>no</flc> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 6ff9df5766..6e067c8c20 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -270,6 +270,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='yes'> <flc>no</flc> diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml index 6aa5e78612..51a579218f 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -215,6 +215,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml index 6aa5e78612..51a579218f 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -215,6 +215,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml index 78f8d3cac4..f8b72ce7af 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -173,6 +173,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 1d1505f757..603ad39077 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -255,6 +255,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='yes'> <flc>no</flc> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 047763bd43..5cceec1882 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index b8621b5efd..858085883f 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -268,6 +268,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml index f3a436d859..52a578a733 100644 --- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml @@ -166,6 +166,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 95452bb0a4..de378e74c7 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -254,6 +254,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml index d6dc93d957..ff25d4bffb 100644 --- a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml @@ -177,6 +177,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index d0029c65da..3fba78a251 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -260,6 +260,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index a5744e41fa..86079797c9 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -258,6 +258,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index a5744e41fa..86079797c9 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -258,6 +258,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0.ppc.xml b/tests/domaincapsdata/qemu_7.2.0.ppc.xml index 59ace0a0b2..eee1859c1c 100644 --- a/tests/domaincapsdata/qemu_7.2.0.ppc.xml +++ b/tests/domaincapsdata/qemu_7.2.0.ppc.xml @@ -152,6 +152,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index fecb7e4a0a..52d6cfe929 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -260,6 +260,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index ef2637ab26..efe9d3eb52 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -261,6 +261,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml index 5254d8807a..6ce952d910 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml @@ -153,6 +153,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index cde1d70f09..1e2001ee09 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -263,6 +263,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml index 68aa0d6189..43de2072b9 100644 --- a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml @@ -156,6 +156,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> </features> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index ebae9e34d6..04e63d752c 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -261,6 +261,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='no'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml index effa6f6630..f8165fe212 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -262,6 +262,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='yes'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index c36bac3fd2..ea9e085af5 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -262,6 +262,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='yes'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml index 6b78a718b0..d70b639503 100644 --- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml @@ -278,6 +278,7 @@ <genid supported='no'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='yes'/> <s390-pv supported='yes'/> <sev supported='no'/> <sgx supported='no'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 48e9444deb..51a104798f 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -262,6 +262,7 @@ <genid supported='yes'/> <backingStoreInput supported='yes'/> <backup supported='yes'/> + <async-teardown supported='yes'/> <sev supported='no'/> <sgx supported='no'/> <hyperv supported='yes'> -- 2.41.0

2 2

[libvirt PATCH] docs: expand clangd instructions
by Jonathon Jongsma 17 Jul '23

17 Jul '23

Add some additional information about running clangd for LSP when clang is not your normal compiler. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- docs/clangd.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/clangd.rst b/docs/clangd.rst index 93570ae178..25529948f6 100644 --- a/docs/clangd.rst +++ b/docs/clangd.rst @@ -40,6 +40,14 @@ Create a separate build directory with a ``clangd`` compatible CC=clang CXX=clang++ meson setup build-clang +There are a small number of source files that are generated as part of the +build process. In order to navigate this generated source code, you should also +execute a build in this directory: + +:: + + ninja -C build-clang + Point ``clangd`` (v12 or later) at the correct ``compile_commands.json`` by placing the following into a ``.clangd`` file in the root of the project: @@ -49,3 +57,12 @@ Point ``clangd`` (v12 or later) at the correct --- CompileFlags: CompilationDatabase: "build-clang" + + +Please note that if you are not using clang for your daily development, the +``build-clang`` directory can get out of sync with the current state of the +project over time. When you update your git checkout, new files may be added or +configuration options changed and ``clangd`` may start to behave unpredictably. +In this case, you will need to update your compilation database by doing a new +build in the ``build-clang`` directory. This should allow clangd to work +reliably again. -- 2.41.0

3 2

[PATCH] qemu: Add NUMA node automatically for memory hotplug
by Michal Privoznik 17 Jul '23

17 Jul '23

Up until v2.11.0-rc2~19^2~3 QEMU used to require at least one NUMA node to be configured when memory hotplug was enabled. After that commit, QEMU automatically adds a NUMA node if none was specified on the cmd line. Reflect this in domain XML, i.e. explicitly add a NUMA node into our domain definition if needed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 53 ++++++++++++++++++- ...emory-hotplug-ppc64-nonuma-abi-update.args | 11 ++-- ...memory-hotplug-ppc64-nonuma-abi-update.xml | 7 ++- 3 files changed, 63 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3700b3e711..a9ed5f5901 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4807,6 +4807,51 @@ qemuDomainDefTsegPostParse(virDomainDef *def, } +static int +qemuDomainDefNumaAutoAdd(virDomainDef *def, + unsigned int parseFlags) +{ + bool abiUpdate = !!(parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE); + unsigned long long initialMem; + size_t i; + + if (!abiUpdate || + !virDomainDefHasMemoryHotplug(def) || + virDomainNumaGetNodeCount(def->numa) > 0) { + return 0; + } + + initialMem = virDomainDefGetMemoryInitial(def); + + if (!def->numa) + def->numa = virDomainNumaNew(); + + virDomainNumaSetNodeCount(def->numa, 1); + virDomainNumaSetNodeMemorySize(def->numa, 0, initialMem); + + for (i = 0; i < def->nmems; i++) { + virDomainMemoryDef *mem = def->mems[i]; + + switch (mem->model) { + case VIR_DOMAIN_MEMORY_MODEL_DIMM: + case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: + if (mem->targetNode == -1) + mem->targetNode = 0; + break; + + case VIR_DOMAIN_MEMORY_MODEL_NONE: + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: + case VIR_DOMAIN_MEMORY_MODEL_LAST: + break; + } + } + + return 0; +} + + /** * qemuDomainDefNumaCPUsRectify: * @numa: pointer to numa definition @@ -4841,8 +4886,12 @@ qemuDomainDefNumaCPUsRectify(virDomainDef *def, static int qemuDomainDefNumaCPUsPostParse(virDomainDef *def, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps, + unsigned int parseFlags) { + if (qemuDomainDefNumaAutoAdd(def, parseFlags) < 0) + return -1; + return qemuDomainDefNumaCPUsRectify(def, qemuCaps); } @@ -4914,7 +4963,7 @@ qemuDomainDefPostParse(virDomainDef *def, if (qemuDomainDefTsegPostParse(def, qemuCaps) < 0) return -1; - if (qemuDomainDefNumaCPUsPostParse(def, qemuCaps) < 0) + if (qemuDomainDefNumaCPUsPostParse(def, qemuCaps, parseFlags) < 0) return -1; return 0; diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args index 83bfb1123c..18ae15aa0b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args +++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args @@ -10,13 +10,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \ +-machine pseries,usb=off,dump-guest-core=off \ -accel kvm \ -cpu POWER9 \ --m size=1048576k,slots=16,maxmem=4194304k \ --object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":1073741824}' \ +-m size=1310720k,slots=16,maxmem=4194304k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1342177280}' \ +-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ -display none \ -no-user-config \ @@ -27,9 +28,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=on \ -object '{"qom-type":"memory-backend-ram","id":"memdimm0","size":536870912}' \ --device '{"driver":"pc-dimm","memdev":"memdimm0","id":"dimm0","slot":0}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","slot":0}' \ -object '{"qom-type":"memory-backend-ram","id":"memdimm1","size":536870912}' \ --device '{"driver":"pc-dimm","memdev":"memdimm1","id":"dimm1","slot":1}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm1","id":"dimm1","slot":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml index d0be98f140..c4677dc977 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml @@ -2,7 +2,7 @@ <name>QEMUGuest1</name> <uuid>49545eb3-75e1-2d0a-acdd-f0294406c99e</uuid> <maxMemory slots='16' unit='KiB'>4194304</maxMemory> - <memory unit='KiB'>2097152</memory> + <memory unit='KiB'>2098177</memory> <currentMemory unit='KiB'>2097152</currentMemory> <vcpu placement='static'>1</vcpu> <os> @@ -11,6 +11,9 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>POWER9</model> + <numa> + <cell id='0' cpus='0' memory='1049601' unit='KiB'/> + </numa> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> @@ -29,12 +32,14 @@ <memory model='dimm'> <target> <size unit='KiB'>524288</size> + <node>0</node> </target> <address type='dimm' slot='0'/> </memory> <memory model='dimm'> <target> <size unit='KiB'>524288</size> + <node>0</node> </target> <address type='dimm' slot='1'/> </memory> -- 2.41.0

2 1

Add blocksize properties to libvirt
by Андрей Ячменёв 17 Jul '23

17 Jul '23

2 1

[PATCH] Added support for vendor and product for qemu ide-hd
by Benedek Major 17 Jul '23

17 Jul '23

The XML-Schema specifies two tags vendor and product for the disk type. But they only apply to the SCSI bus, even though the QEMU driver ide-hd and ide-cd have support for the command line argument -model. The model corresponds to words 27-46 of the IDENTIFY PACKET DEVICE response from the ATAPI spec. Words 27-46 is a 40 Char space for the model number of the device. The model number is built by combining the vendor and the product fields with a single space as separator in the middle. Therefore I would say, that vendor and product pretty much correlate to the model field in QEMU, so the ide disk should also have the possibility of adding vendor and product to it. The tests got changed to incorporate the new error message which now contains that the ide and sata bus also supports vendor and product. Also the xml to command line tests got updated, to have both fields present for testing. The command generator reordered a bit too, to only include disk->vendor and disk->product into the json generation, when the scsi bus is selected. The same logic applies to the ide and sata bus. Signed-off-by: Benedek Major <benedek(a)major.onl> --- src/qemu/qemu_command.c | 21 ++++++++++++++++--- src/qemu/qemu_validate.c | 6 ++++-- .../disk-sata-device.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-sata-device.xml | 2 ++ ...csi-disk-vpd-build-error.x86_64-latest.err | 2 +- .../disk-sata-device.x86_64-latest.xml | 2 ++ 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ad224571f3..903872091f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1943,8 +1943,6 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, "p:physical_block_size", physical_block_size, "A:wwn", &wwn, "p:rotation_rate", disk->rotation_rate, - "S:vendor", disk->vendor, - "S:product", disk->product, "T:removable", removable, "S:write-cache", qemuOnOffAuto(writeCache), "p:cyls", disk->geometry.cylinders, @@ -1956,7 +1954,24 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, "S:rerror", rpolicy, NULL) < 0) return NULL; - + if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { + /* add vendor and product in SCSI section, since only SCSI supports + * vendor and product tag*/ + if (virJSONValueObjectAdd(&props, + "S:vendor", disk->vendor, + "S:product", disk->product, + NULL) < 0) + return NULL; + } + if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE || disk->bus == VIR_DOMAIN_DISK_BUS_SATA) { + /* Repurpose vendor and product, since IDE-Disk only supports model, + * which per ATAPI spec is the combination of vendor and product + * separated by a single space*/ + if (virJSONValueObjectAdd(&props, + "S:model", g_strconcat(disk->vendor, " ", disk->product, NULL), + NULL) < 0) + return NULL; + } return g_steal_pointer(&props); } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 7e09e2c52f..e7312bf789 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2871,9 +2871,11 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, } if (disk->vendor || disk->product) { - if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI + && disk->bus != VIR_DOMAIN_DISK_BUS_IDE + && disk->bus != VIR_DOMAIN_DISK_BUS_SATA) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only scsi disk supports vendor and product")); + _("Only scsi, sata and ide disk supports vendor and product")); return -1; } diff --git a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args index b60d9b16d4..296f8f1ee0 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ahci","id":"sata0","bus":"pci.0","addr":"0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUG uest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"sata0.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ +-device '{"driver":"ide-hd","bus":"sata0.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1,"model":"Seagate ST3500418AS"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-sata-device.xml b/tests/qemuxml2argvdata/disk-sata-device.xml index a9def2923e..51eb472dcc 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.xml +++ b/tests/qemuxml2argvdata/disk-sata-device.xml @@ -19,6 +19,8 @@ <source dev='/dev/HostVG/QEMUG uest1'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> + <vendor>Seagate</vendor> + <product>ST3500418AS</product> </disk> <controller type='usb' index='0'/> <controller type='sata' index='0'/> diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err index f70b7a774f..fd77b3feb0 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err @@ -1 +1 @@ -unsupported configuration: Only scsi disk supports vendor and product +unsupported configuration: Only scsi, sata and ide disk supports vendor and product diff --git a/tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml index cd20f5185b..6caedf66a5 100644 --- a/tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml @@ -21,6 +21,8 @@ <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUG uest1'/> <target dev='sda' bus='sata'/> + <vendor>Seagate</vendor> + <product>ST3500418AS</product> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0' model='piix3-uhci'> -- 2.41.0

3 2

[PATCH v2] nodedev: transient mdev update on nodeDeviceCreateXML
by Boris Fiuczynski 17 Jul '23

17 Jul '23

Update the optional mdev attributes by running an mdevctl update on a new created nodedev object representing an mdev. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2143158 Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- src/node_device/node_device_udev.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 4c37ec3189..fce4212728 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1757,12 +1757,20 @@ nodeStateCleanup(void) static int udevHandleOneDevice(struct udev_device *device) { + virNodeDevCapType dev_cap_type; const char *action = udev_device_get_action(device); VIR_DEBUG("udev action: '%s': %s", action, udev_device_get_syspath(device)); - if (STREQ(action, "add") || STREQ(action, "change")) - return udevAddOneDevice(device); + if (STREQ(action, "add") || STREQ(action, "change")) { + int ret = udevAddOneDevice(device); + if (ret == 0 && + udevGetDeviceType(device, &dev_cap_type) == 0 && + dev_cap_type == VIR_NODE_DEV_CAP_MDEV) + if (nodeDeviceUpdateMediatedDevices() < 0) + VIR_WARN("mdevctl failed to update mediated devices"); + return ret; + } if (STREQ(action, "remove")) return udevRemoveOneDevice(device); -- 2.41.0

2 9

[PATCH] spec: Do not disable some systemd units of newly split package
by Martin Kletzander 14 Jul '23

14 Jul '23

Since virtproxyd was split into libvirt-daemon-proxy package it can happen that, in case a distribution has such systemd preset, when installing this package, already pre-enabled and configured units like -tls.socket and -tcp.socket will get disabled. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2210058 Fixes: 5358618b1cd0afc126aed313249bf2134731665f Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- This is more like an RFC as I would really like to know what to really do in this case. What happens, basically, is that if you have libvirt-daemon-9.0.0 and set up virtproxyd-tls.socket for example and then upgrade to anything newer, then the package libvirt-daemon-proxy will get installed. The %post action calls "%libvirt_daemon_systemd_post_inet virtproxyd" which calls "%systemd_post with all virtproxyd units. What %systemd_post is supposed to do is reset units to a preset state in the case of package installation, but not during upgrade. However the libvirt-daemon-proxy package did not exist on the system before, so this action is not an update, but an installation. If no preset is mentioned for a unit then `systemctl preset` does not change anything. However some distros might have a catch-all preset "disable *" for some reason, I guess based on an example in the documentation, and there is no way to override an already configured preset, you can only enable or disable a unit in a preset. That all means than it can happen that you enable virtproxyd-tcp.socket, for example, then update your system and find that it is disabled. There are various ways to deal with this, but I don't see any one that would 100% satisfy me with regards to all the issues and at the same time could be implemented "soon enough" given libvirt already had three releases with the libvirt-daemon-proxy split. libvirt.spec.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1f77cd90b772..50f521b7ce88 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1592,7 +1592,13 @@ fi %post daemon-proxy %if %{with_modular_daemons} -%libvirt_daemon_systemd_post_inet virtproxyd +# Since this was split into a different package, a transparent update for the +# virtproxyd units could actually disable an already configured ones +# (e.g. virtproxyd-tls.socket) as %systemd_post runs `systemctl preset` if this +# is an installation (and is skipped on update). So skip this step for those +# that need an extra setup to work since they will most likely not be preset to +# enabled, but that is up to the point of the distribution. +%libvirt_daemon_systemd_post virtproxyd %endif %preun daemon-proxy -- 2.41.0

4 16

[PATCH 0/3] Don't use 'query-commands' to probe presence of commands
by Peter Krempa 14 Jul '23

14 Jul '23

We now call 'query-qmp-schema' unconditionally and can extract the information from there. Peter Krempa (3): qemu: capabilities: Probe presence of commands from QMP schema instead of 'query-commands' qemu: capabilities: Don't probe 'query-commands' qemu_monitor: Remove helpers for 'query-commands' src/qemu/qemu_capabilities.c | 30 +- src/qemu/qemu_monitor.c | 12 - src/qemu/qemu_monitor.h | 2 - src/qemu/qemu_monitor_json.c | 44 - src/qemu/qemu_monitor_json.h | 5 - .../caps_4.2.0_aarch64.replies | 700 ++------------ .../caps_4.2.0_ppc64.replies | 678 ++------------ .../caps_4.2.0_s390x.replies | 686 ++------------ .../caps_4.2.0_x86_64.replies | 732 ++------------- .../caps_5.0.0_aarch64.replies | 704 ++------------ .../caps_5.0.0_ppc64.replies | 690 ++------------ .../caps_5.0.0_riscv64.replies | 682 ++------------ .../caps_5.0.0_x86_64.replies | 736 ++------------- .../caps_5.1.0_sparc.replies | 629 +------------ .../caps_5.1.0_x86_64.replies | 743 ++------------- .../caps_5.2.0_aarch64.replies | 735 ++------------- .../caps_5.2.0_ppc64.replies | 717 ++------------- .../caps_5.2.0_riscv64.replies | 709 ++------------ .../caps_5.2.0_s390x.replies | 717 ++------------- .../caps_5.2.0_x86_64.replies | 767 ++-------------- .../caps_6.0.0_aarch64.replies | 732 ++------------- .../caps_6.0.0_s390x.replies | 714 ++------------- .../caps_6.0.0_x86_64.replies | 767 ++-------------- .../caps_6.1.0_x86_64.replies | 770 ++-------------- .../caps_6.2.0_aarch64.replies | 739 ++------------- .../caps_6.2.0_ppc64.replies | 741 ++------------- .../caps_6.2.0_x86_64.replies | 807 ++-------------- .../caps_7.0.0_aarch64+hvf.replies | 770 ++-------------- .../caps_7.0.0_aarch64.replies | 770 ++-------------- .../caps_7.0.0_ppc64.replies | 745 ++------------- .../caps_7.0.0_x86_64.replies | 807 ++-------------- .../caps_7.1.0_ppc64.replies | 763 ++-------------- .../caps_7.1.0_x86_64.replies | 825 ++--------------- .../caps_7.2.0_ppc.replies | 772 ++-------------- .../caps_7.2.0_x86_64+hvf.replies | 843 ++--------------- .../caps_7.2.0_x86_64.replies | 843 ++--------------- .../caps_8.0.0_riscv64.replies | 761 ++------------- .../caps_8.0.0_x86_64.replies | 864 ++---------------- .../caps_8.1.0_s390x.replies | 788 ++-------------- .../caps_8.1.0_x86_64.replies | 864 ++---------------- tests/qemumonitorjsontest.c | 59 -- 41 files changed, 2778 insertions(+), 23684 deletions(-) -- 2.41.0

2 4

[libvirt PATCH 00/10] A set of minor doc updates for new contributors
by Tim Small 14 Jul '23

14 Jul '23

As a prospective contributor, whilst the documentation is generally very helpful, I found a few minor gaps and inconsistencies. I thought I would strike while the iron was hot, and attempt to make some improvements. The changes are mostly minor clarifications, and additional internal references between articles. The only new material is a guide to using clangd with the libvirt code base (since clangd has become a common programming tool, and is particularly useful for navigating unfamiliar code bases). On build hosts where gcc is the default compiler, some manual steps are necessary before clangd will work with the libvirt code, and I thought these were worth documenting. Tim Small (10): docs: Link to main docs directory from Quick Links docs: Missing "full-stop"/"period" on some bullet items docs: Link main "contributing" from programming-specific guide docs: Point to compiling guide from code contribution guide docs: Add config instructions for clangd with libvirt docs: Reword "Preparing Patches" to clarify docs: Advise running CI tests prior to submission docs: Point to mailing list archives from submitting-patches docs: Fix deprecated use of implicit meson "setup" command docs: Reword ninja invocation note to clarify build directory docs/clangd.rst | 51 +++++++++++++++++++++++++++++++++++++ docs/compiling.rst | 14 +++++----- docs/contribute.rst | 6 ++--- docs/hacking.rst | 29 ++++++++++++++++++--- docs/index.rst | 2 ++ docs/meson.build | 1 + docs/submitting-patches.rst | 5 ++++ 7 files changed, 96 insertions(+), 12 deletions(-) create mode 100644 docs/clangd.rst -- 2.39.2

2 11

[PATCH] qemu_domain: Deduplicate targetNode check in qemuDomainDefValidateMemoryHotplugDevice()
by Michal Privoznik 13 Jul '23

13 Jul '23

If a domain has NUMA configured, then all <memory/> devices (except for 'virtio-pmem') need to have targetNode set. There are two checks inside of qemuDomainDefValidateMemoryHotplugDevice() for this: one inside of big switch() statement, which only checks 'dimm' and 'nvdimm' cases, and the other at the end of the function that checks all models (except for 'virtio-pmem'). Let's keep the latter and remove the former as the latter covers the former too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 94587638c3..3700b3e711 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9189,15 +9189,6 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem, return -1; } - if (virDomainNumaGetNodeCount(def->numa) != 0) { - if (mem->targetNode == -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("target NUMA node needs to be specified for " - "memory device")); - return -1; - } - } - if (mem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM) { if (mem->info.addr.dimm.slot >= def->mem.memory_slots) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 2.41.0

2 1

[PATCH 0/2] libxl: migration fixes
by Jim Fehlig 13 Jul '23

13 Jul '23

A different (and more correct IMO) approach to fixing issues in the migration error handling logic. Initial attempt here https://listman.redhat.com/archives/libvir-list/2023-July/240652.html Jim Fehlig (2): libxl: Don't attempt to resume domain on canceled migration libxl: Advertise support for VIR_MIGRATE_CHANGE_PROTECTION src/libxl/libxl_driver.c | 2 +- src/libxl/libxl_migration.c | 16 +--------------- src/libxl/libxl_migration.h | 3 ++- 3 files changed, 4 insertions(+), 17 deletions(-) -- 2.41.0

2 4

[libvirt PATCH] docs: index: Add a quick link to Submitting patches
by Erik Skultety 13 Jul '23

13 Jul '23

We still get MRs in Gitlab from individual contributors on a regular basis which in some ways just makes maintainer's or reviewer's life just a bit more complicated. This ultimately means our guidelines are probably not visible enough on the main page (or some people wouldn't read them anyway). While this patch can't make the problem go away, it can at least attempt to mitigate it by creating a quick link to the 'hacking' page, skipping a lot of TL;DR contents in contributing.rst which we link from the main page. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Feel free to reject this patch if you think it provides absolutely no value towards mitigating the issue at hand. docs/index.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/index.rst b/docs/index.rst index d55c4bb94d..eaadffaa9b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -30,6 +30,9 @@ Quick Links `New contributors <contribute.html>`__ Get involved in the libvirt community & student outreach programs +`Submitting patches <hacking.html>`__ + Already a regular open source contributor and have git set up? Have a quick + look at how to propose your changes to libvirt correctly `Security vulnerabilities <securityprocess.html>`__ View security notices and report vulnerabilities to the libvirt security response team -- 2.41.0

2 1

[PATCH 00/10] More real qemu capability testing cleanups
by Peter Krempa 13 Jul '23

13 Jul '23

Few other patches to move towards purely real qemu-caps testing. Peter Krempa (10): testutils: Print number of failed tests domaincapstest: Use obviously fake firmware name in capabilities testQemuGetRealCaps: Strip the default machine alias before insertion into cache testQemuGetRealCaps: Extract caching of the caps into a new helper testutilsqemu: Introduce 'testQemuInsertRealCaps' helper qemumemlocktest: Use 'testQemuInsertRealCaps' tests: qemudomainsnapshotxml2xmlout: Use real 'x86_64' capabilities in all test data qemuagenttest: Use real x86_64 capabilities for parsing domain definitions qemudomaincheckpointxml2xmltest: Use real 'x86_64' capabilities in all test data qemuTestDriverInit: Don't autopopulate qemu capabilities when initializing driver .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 5 +- .../qemu_4.2.0-virt.aarch64.xml | 5 +- tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_4.2.0.s390x.xml | 5 +- tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 5 +- .../qemu_5.0.0-tcg-virt.riscv64.xml | 5 +- .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 5 +- .../qemu_5.0.0-virt.aarch64.xml | 5 +- .../qemu_5.0.0-virt.riscv64.xml | 5 +- tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 5 +- tests/domaincapsdata/qemu_5.1.0.sparc.xml | 5 +- tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 5 +- .../qemu_5.2.0-tcg-virt.riscv64.xml | 5 +- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 5 +- .../qemu_5.2.0-virt.aarch64.xml | 5 +- .../qemu_5.2.0-virt.riscv64.xml | 5 +- tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_5.2.0.s390x.xml | 5 +- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 5 +- .../qemu_6.0.0-virt.aarch64.xml | 5 +- tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_6.0.0.s390x.xml | 5 +- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 5 +- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 5 +- .../qemu_6.2.0-virt.aarch64.xml | 5 +- tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 5 +- .../qemu_7.0.0-hvf.aarch64+hvf.xml | 5 +- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 5 +- .../qemu_7.0.0-virt.aarch64.xml | 5 +- tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 5 +- tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 5 +- .../qemu_7.2.0-hvf.x86_64+hvf.xml | 5 +- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 5 +- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 5 +- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 5 +- tests/domaincapsdata/qemu_7.2.0.ppc.xml | 5 +- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 5 +- .../qemu_8.0.0-tcg-virt.riscv64.xml | 5 +- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 5 +- .../qemu_8.0.0-virt.riscv64.xml | 5 +- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 5 +- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 5 +- tests/domaincapstest.c | 5 +- tests/qemuagentdata/fsinfo.xml | 4 +- tests/qemuagenttest.c | 8 ++ .../internal-active-invalid.xml | 4 +- .../internal-inactive-invalid.xml | 4 +- .../redefine.xml | 9 +- tests/qemudomaincheckpointxml2xmltest.c | 6 + .../disk_snapshot_redefine.xml | 9 +- .../external_vm_redefine.xml | 9 +- .../full_domain.xml | 9 +- .../qemudomainsnapshotxml2xmlout/metadata.xml | 9 +- tests/qemudomainsnapshotxml2xmltest.c | 6 + tests/qemumemlocktest.c | 19 +-- tests/testutils.c | 2 +- tests/testutilsqemu.c | 136 +++++++++++++----- tests/testutilsqemu.h | 10 ++ 84 files changed, 310 insertions(+), 279 deletions(-) -- 2.41.0

2 12

[PATCH] libxl: Defer starting job until migration perform phase
by Jim Fehlig 13 Jul '23

13 Jul '23

Currently the libxl driver calls virDomainObjBeginJob in the begin phase of migration on the source host, expecting to call virDomainObjEndJob in the confirm phase. But the confirm phase is never executed if the prepare or perform phases fail. The job was already being terminated in the perform phase in case of failure, but there is no way to do that if the prepare phase fails since it runs on the destination host. Move the call to virDomainObjBeginJob to the perform phase. It can be terminated there in the event of failure. On success, the confirm phase will be executed, ensuring the job is terminated. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_migration.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 961815f9f7..126265f895 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -378,19 +378,11 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn, virDomainDef *def; char *xml = NULL; - /* - * In the case of successful migration, a job is started here and - * terminated in the confirm phase. Errors in the begin or perform - * phase will also terminate the job. - */ - if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) - goto cleanup; - if (!(mig = libxlMigrationCookieNew(vm))) - goto endjob; + goto cleanup; if (libxlMigrationBakeCookie(mig, cookieout, cookieoutlen) < 0) - goto endjob; + goto cleanup; if (xmlin) { if (!(tmpdef = virDomainDefParseString(xmlin, @@ -398,10 +390,10 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) - goto endjob; + goto cleanup; if (!libxlDomainDefCheckABIStability(driver, vm->def, tmpdef)) - goto endjob; + goto cleanup; def = tmpdef; } else { @@ -409,15 +401,9 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn, } if (!libxlDomainMigrationIsAllowed(def)) - goto endjob; + goto cleanup; xml = virDomainDefFormat(def, driver->xmlopt, VIR_DOMAIN_DEF_FORMAT_SECURE); - /* Valid xml means success! EndJob in the confirm phase */ - if (xml) - goto cleanup; - - endjob: - virDomainObjEndJob(vm); cleanup: libxlMigrationCookieFree(mig); @@ -1209,6 +1195,13 @@ libxlDomainMigrationSrcPerform(libxlDriverPrivate *driver, sockfd = virNetSocketDupFD(sock, true); virObjectUnref(sock); + /* + * Start a job for the migration and terminate it in the confirm + * phase, taking care to handle error cases. + */ + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + return -1; + /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); ret = libxlDoMigrateSrcSend(driver, vm, flags, sockfd); @@ -1223,8 +1216,8 @@ libxlDomainMigrationSrcPerform(libxlDriverPrivate *driver, } } else { /* - * Confirm phase will not be executed if perform fails. End the - * job started in begin phase. + * End the job since the confirm phase will not be executed if + * perform fails. */ virDomainObjEndJob(vm); } @@ -1383,7 +1376,7 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivate *driver, ret = 0; cleanup: - /* EndJob for corresponding BeginJob in begin phase */ + /* EndJob for corresponding BeginJob in perform phase */ virDomainObjEndJob(vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); -- 2.41.0

1 2

[PATCH] node_device: Enclose Linux specific code in ifdef __linux__
by Michal Privoznik 11 Jul '23

11 Jul '23

Our CI started to enable udev backend on FreeBSD. And while there is udev on FreeBSD some parts of our code are highly Linux specific, e.g. translating SCSI device type to string (from an integer obtained from the sysfs). Obviously, this doesn't work anywhere else. This is the reason why we need to include scsi/scsi.h header file (which actually comes from the Linux kernel source tree but for some reason glibc started to distribute it, followed by musl). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/node_device/node_device_udev.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 4c37ec3189..960f3fd942 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -22,7 +22,9 @@ #include <gio/gio.h> #include <libudev.h> #include <pciaccess.h> -#include <scsi/scsi.h> +#ifdef __linux__ +# include <scsi/scsi.h> +#endif #include "node_device_conf.h" #include "node_device_event.h" @@ -678,6 +680,8 @@ udevGetSCSIType(virNodeDeviceDef *def G_GNUC_UNUSED, *typestring = NULL; +#ifdef __linux__ + /* These values are Linux specific. */ switch (type) { case TYPE_DISK: *typestring = g_strdup("disk"); @@ -714,6 +718,10 @@ udevGetSCSIType(virNodeDeviceDef *def G_GNUC_UNUSED, foundtype = 0; break; } +#else + /* Implement me. */ + foundtype = 0; +#endif if (*typestring == NULL) { if (foundtype == 1) { -- 2.41.0

2 1

[libvirt PATCH v3 0/5] Enable asynchronous teardown
by Boris Fiuczynski 11 Jul '23

11 Jul '23

Update capabilities for QEMU 8.1 on s390x, add a new capability async-teardown and make use of it when running on s390x hosts to improve memory reclaiming. v3: - rebased on upstream master - split QEMU hotplug input XML test file changes into separate patch - added missing slash in XML example doc - improved commit message of patch 5 by adding the reason why s390x decided to enable asynchronous teardown by default - moved default enabling from method qemuDomainDefAddDefaultDevices into method qemuDomainDefEnableDefaultFeatures - added received RBs v2: - switched to use on/off on the QEMU command line - added configuration management of the feature to the domain XML Boris Fiuczynski (4): tests: remove acpi support from s390x ccw hotplug tests qemu: add run-with async-teardown capability qemu: allow use of async teardown in domain qemu: enable asynchronous teardown on s390x hosts by default Shalini Chellathurai Saroja (1): tests: add capabilities for QEMU 8.1.0 on s390x docs/formatdomain.rst | 6 + src/conf/domain_conf.c | 22 + src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 9 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 20 + src/qemu/qemu_domain.c | 19 + src/qemu/qemu_validate.c | 9 + tests/domaincapsdata/qemu_8.1.0.s390x.xml | 285 + .../caps_8.1.0_s390x.replies | 34594 ++++++++++++++++ .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 3719 ++ .../caps_8.1.0_x86_64.xml | 1 + .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 2 +- ...ith-2-ccw-virtio+ccw-virtio-1-explicit.xml | 1 - ...with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 2 +- ...otplug-base-ccw-live-with-2-ccw-virtio.xml | 2 +- ...-with-ccw-virtio+ccw-virtio-2-explicit.xml | 2 +- ...-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 2 +- ...uhotplug-base-ccw-live-with-ccw-virtio.xml | 2 +- .../qemuhotplug-base-ccw-live.xml | 2 +- .../async-teardown.x86_64-latest.args | 37 + tests/qemuxml2argvdata/async-teardown.xml | 31 + .../balloon-ccw-deflate.s390x-latest.args | 3 +- .../console-sclp.s390x-latest.args | 7 +- .../console-virtio-ccw.s390x-latest.args | 9 +- .../cpu-s390-features.s390x-latest.args | 1 + .../cpu-s390-zEC12.s390x-latest.args | 1 + ...default-video-type-s390x.s390x-latest.args | 5 +- .../disk-error-policy-s390x.s390x-latest.args | 7 +- .../disk-virtio-ccw-many.s390x-latest.args | 11 +- .../disk-virtio-ccw.s390x-latest.args | 7 +- .../disk-virtio-s390-zpci.s390x-latest.args | 7 +- .../fs9p-ccw.s390x-latest.args | 11 +- ...tdev-scsi-vhost-scsi-ccw.s390x-latest.args | 9 +- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 5 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 5 +- ...dev-subsys-mdev-vfio-ccw.s390x-latest.args | 5 +- ...o-zpci-autogenerate-fids.s390x-latest.args | 11 +- ...o-zpci-autogenerate-uids.s390x-latest.args | 11 +- ...v-vfio-zpci-autogenerate.s390x-latest.args | 7 +- ...dev-vfio-zpci-boundaries.s390x-latest.args | 15 +- ...vfio-zpci-ccw-memballoon.s390x-latest.args | 9 +- ...io-zpci-multidomain-many.s390x-latest.args | 35 +- .../hostdev-vfio-zpci.s390x-latest.args | 7 +- .../input-virtio-ccw.s390x-latest.args | 11 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 9 +- .../launch-security-s390-pv.s390x-latest.args | 7 +- ...chine-aeskeywrap-off-cap.s390x-latest.args | 3 +- ...hine-aeskeywrap-off-caps.s390x-latest.args | 3 +- ...achine-aeskeywrap-on-cap.s390x-latest.args | 3 +- ...chine-aeskeywrap-on-caps.s390x-latest.args | 3 +- ...chine-deakeywrap-off-cap.s390x-latest.args | 3 +- ...hine-deakeywrap-off-caps.s390x-latest.args | 3 +- ...achine-deakeywrap-on-cap.s390x-latest.args | 3 +- ...chine-deakeywrap-on-caps.s390x-latest.args | 3 +- ...achine-keywrap-none-caps.s390x-latest.args | 3 +- .../machine-keywrap-none.s390x-latest.args | 3 +- ...machine-loadparm-hostdev.s390x-latest.args | 5 +- ...multiple-disks-nets-s390.s390x-latest.args | 15 +- ...achine-loadparm-net-s390.s390x-latest.args | 7 +- .../machine-loadparm-s390.s390x-latest.args | 5 +- .../net-virtio-ccw.s390x-latest.args | 11 +- ...low-bogus-usb-controller.s390x-latest.args | 11 +- ...390-allow-bogus-usb-none.s390x-latest.args | 11 +- ...0-async-teardown-disabled.s390x-6.0.0.args | 35 + ...-async-teardown-disabled.s390x-latest.args | 36 + .../s390-async-teardown-disabled.xml | 24 + ...async-teardown-no-attrib.s390x-latest.args | 36 + .../s390-async-teardown-no-attrib.xml | 24 + .../s390-async-teardown.s390x-6.0.0.err | 1 + .../s390-async-teardown.s390x-latest.args | 36 + .../qemuxml2argvdata/s390-async-teardown.xml | 24 + ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 5 +- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 3 +- ...no-async-teardown-autogen.s390x-6.0.0.args | 32 + ...o-async-teardown-autogen.s390x-latest.args | 33 + .../s390-no-async-teardown-autogen.xml | 18 + .../s390-panic-missing.s390x-latest.args | 7 +- .../s390-panic-no-address.s390x-latest.args | 7 +- .../s390-serial-2.s390x-latest.args | 5 +- .../s390-serial-console.s390x-latest.args | 3 +- .../s390-serial.s390x-latest.args | 3 +- .../s390x-ccw-graphics.s390x-latest.args | 23 +- .../s390x-ccw-headless.s390x-latest.args | 17 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 7 +- .../vhost-vsock-ccw-iommu.s390x-latest.args | 7 +- .../vhost-vsock-ccw-iommu.xml | 3 + .../vhost-vsock-ccw.s390x-latest.args | 7 +- .../video-virtio-gpu-ccw.s390x-latest.args | 9 +- .../virtio-rng-ccw.s390x-latest.args | 11 +- .../watchdog-diag288.s390x-latest.args | 7 +- tests/qemuxml2argvtest.c | 9 + .../async-teardown.x86_64-latest.xml | 44 + .../default-video-type-s390x.s390x-latest.xml | 3 + .../disk-virtio-s390-zpci.s390x-latest.xml | 3 + ...stdev-scsi-vhost-scsi-ccw.s390x-latest.xml | 3 + ...stdev-subsys-mdev-vfio-ap.s390x-latest.xml | 3 + ...subsys-mdev-vfio-ccw-boot.s390x-latest.xml | 3 + ...tdev-subsys-mdev-vfio-ccw.s390x-latest.xml | 3 + ...io-zpci-autogenerate-fids.s390x-latest.xml | 3 + ...io-zpci-autogenerate-uids.s390x-latest.xml | 3 + ...ev-vfio-zpci-autogenerate.s390x-latest.xml | 3 + ...tdev-vfio-zpci-boundaries.s390x-latest.xml | 3 + ...-vfio-zpci-ccw-memballoon.s390x-latest.xml | 3 + ...fio-zpci-multidomain-many.s390x-latest.xml | 3 + .../hostdev-vfio-zpci.s390x-latest.xml | 3 + .../input-virtio-ccw.s390x-latest.xml | 3 + ...iothreads-disk-virtio-ccw.s390x-latest.xml | 3 + ...iothreads-virtio-scsi-ccw.s390x-latest.xml | 3 + .../machine-loadparm-hostdev.s390x-latest.xml | 3 + ...-multiple-disks-nets-s390.s390x-latest.xml | 3 + ...90-async-teardown-disabled.s390x-6.0.0.xml | 36 + ...0-async-teardown-disabled.s390x-latest.xml | 36 + ...-async-teardown-no-attrib.s390x-latest.xml | 36 + .../s390-async-teardown.s390x-latest.xml | 36 + ...lt-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml | 3 + ...lt-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml | 3 + ...lt-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml | 3 + ...lt-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml | 3 + .../s390-defaultconsole.s390x-latest.xml | 3 + ...-no-async-teardown-autogen.s390x-6.0.0.xml | 25 + ...no-async-teardown-autogen.s390x-latest.xml | 28 + .../s390-panic-missing.s390x-latest.xml | 3 + .../s390-panic-no-address.s390x-latest.xml | 3 + .../s390-panic.s390x-latest.xml | 3 + .../s390-serial-2.s390x-latest.xml | 3 + .../s390-serial-console.s390x-latest.xml | 3 + .../s390-serial.s390x-latest.xml | 3 + .../s390x-ccw-graphics.s390x-latest.xml | 3 + .../s390x-ccw-headless.s390x-latest.xml | 3 + .../vhost-vsock-ccw-auto.s390x-latest.xml | 3 + .../vhost-vsock-ccw.s390x-latest.xml | 3 + ...video-virtio-gpu-ccw-auto.s390x-latest.xml | 3 + .../video-virtio-gpu-ccw.s390x-latest.xml | 3 + tests/qemuxml2xmltest.c | 8 + 138 files changed, 39680 insertions(+), 197 deletions(-) create mode 100644 tests/domaincapsdata/qemu_8.1.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml create mode 100644 tests/qemuxml2argvdata/async-teardown.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/async-teardown.xml create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-6.0.0.args create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-disabled.xml create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-no-attrib.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-no-attrib.xml create mode 100644 tests/qemuxml2argvdata/s390-async-teardown.s390x-6.0.0.err create mode 100644 tests/qemuxml2argvdata/s390-async-teardown.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-async-teardown.xml create mode 100644 tests/qemuxml2argvdata/s390-no-async-teardown-autogen.s390x-6.0.0.args create mode 100644 tests/qemuxml2argvdata/s390-no-async-teardown-autogen.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-no-async-teardown-autogen.xml create mode 100644 tests/qemuxml2xmloutdata/async-teardown.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-6.0.0.xml create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown-no-attrib.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390-no-async-teardown-autogen.s390x-6.0.0.xml create mode 100644 tests/qemuxml2xmloutdata/s390-no-async-teardown-autogen.s390x-latest.xml -- 2.41.0

5 32

[PATCH] qemu: Support removable for scsi disk
by Han Han 10 Jul '23

10 Jul '23

Allow //disk/target@removable for scsi disk devices, since QEMU has support the removable attribute for scsi-hd device from v0.14.0[1]. [1]: 419e691f8e: scsi-disk: Allow overriding SCSI INQUIRY removable bit Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/formatdomain.rst | 2 +- src/conf/domain_validate.c | 5 +++-- src/qemu/qemu_command.c | 6 ++++-- ...gs => disk-device-removable.x86_64-latest.args} | 14 +++++++++----- ...ice-removable.xml => disk-device-removable.xml} | 5 +++++ tests/qemuxml2argvtest.c | 2 +- 6 files changed, 23 insertions(+), 11 deletions(-) rename tests/qemuxml2argvdata/{disk-usb-device-removable.x86_64-latest.args => disk-device-removable.x86_64-latest.args} (70%) rename tests/qemuxml2argvdata/{disk-usb-device-removable.xml => disk-device-removable.xml} (80%) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index c3526439bf..676e4b9fd3 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3094,7 +3094,7 @@ paravirtualized driver is specified via the ``disk`` element. CDROM or Floppy disk), the value can be either "open" or "closed", defaults to "closed". NB, the value of ``tray`` could be updated while the domain is running. The optional attribute ``removable`` sets the removable flag for USB - disks, and its value can be either "on" or "off", defaulting to "off". + or SCSI disks, and its value can be either "on" or "off", defaulting to "off". The optional attribute ``rotation_rate`` sets the rotation rate of the storage for disks on a SCSI, IDE, or SATA bus. Values in the range 1025 to 65534 are used to indicate rotational media speed in revolutions per minute. diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 80d6a2ffd9..e7122f6297 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -881,9 +881,10 @@ virDomainDiskDefValidate(const virDomainDef *def, } if (disk->removable != VIR_TRISTATE_SWITCH_ABSENT && - disk->bus != VIR_DOMAIN_DISK_BUS_USB) { + disk->bus != VIR_DOMAIN_DISK_BUS_USB && + !(disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("removable is only valid for usb disks")); + _("removable is only valid for usb or scsi disks")); return -1; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 72363238b8..5ec912ddee 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1781,10 +1781,12 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { driver = "scsi-block"; } else { - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { driver = "scsi-cd"; - else + } else { driver = "scsi-hd"; + removable = disk->removable; + } /* qemu historically used the name of -drive as one of the device * ids in the Vital Product Data Device Identification page if diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args b/tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.args similarity index 70% rename from tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args rename to tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.args index c5bfd8e8e0..106f7b9ce2 100644 --- a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.args @@ -27,13 +27,17 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-format","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-format","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt-2-format","id":"usb-disk0","removable":true}' \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt-1-format","id":"usb-disk0","removable":true}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-1-format","id":"scsi0-0-0-1","removable":true}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.xml b/tests/qemuxml2argvdata/disk-device-removable.xml similarity index 80% rename from tests/qemuxml2argvdata/disk-usb-device-removable.xml rename to tests/qemuxml2argvdata/disk-device-removable.xml index 927a8e8b3e..9400c84863 100644 --- a/tests/qemuxml2argvdata/disk-usb-device-removable.xml +++ b/tests/qemuxml2argvdata/disk-device-removable.xml @@ -22,6 +22,11 @@ <source file='/tmp/usbdisk.img'/> <target dev='sda' bus='usb' removable='on'/> </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sdb' bus='scsi' removable='on'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d914d8cbea..d6a9ab865d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1227,7 +1227,7 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-device-lun-type-invalid"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport"); DO_TEST_CAPS_LATEST("disk-usb-device"); - DO_TEST_CAPS_LATEST("disk-usb-device-removable"); + DO_TEST_CAPS_LATEST("disk-device-removable"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-usb-pci"); DO_TEST_CAPS_LATEST("disk-scsi"); DO_TEST_CAPS_LATEST("disk-scsi-device-auto"); -- 2.40.1

2 4

[PATCH] Revert "meson: attr_dep switch to dependency()"
by Jim Fehlig 07 Jul '23

07 Jul '23

openSUSE Leap 15.{4,5} are supported under libvirt's distro support statement, but they only contain attr version 2.4.47. Reverts: dffeef89efc2ed1668cb485d6c3e67ef27b824e8 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 958c1a26a0..5fce470c6b 100644 --- a/meson.build +++ b/meson.build @@ -901,7 +901,8 @@ if not get_option('apparmor_profiles').disabled() endif endif -attr_dep = dependency('libattr', required: get_option('attr')) +# FIXME rewrite to use dependency() once we can use 2.4.48 +attr_dep = cc.find_library('attr', required: get_option('attr')) if attr_dep.found() conf.set('WITH_LIBATTR', 1) endif -- 2.41.0

2 1

[PATCH v2 0/5] Migration deprecated parts
by Juan Quintela 07 Jul '23

07 Jul '23

On this v2: - dropped -incoming <uri> deprecation Paolo came with a better solution using keyvalues. - skipped field is already ready for next pull request, so dropped. - dropped the RFC bits, nermal PATCH. - Assessed all the review comments. - Added indentation of migration.json. - Used the documentation pointer to substitute block migration. Please review. [v1] Hi this series describe the migration parts that have to be deprecated. - It is an rfc because I doubt that I did the deprecation process right. Hello Markus O:-) - skipped field: It is older than me, I have never know what it stands for. As far as I know it has always been zero. - inc/blk migrate command options. They are only used by block migration (that I deprecate on the following patch). And they are really bad. grep must_remove_block_options. - block migration. block jobs, whatever they are called this week are way more flexible. Current code works, but we broke it here and there, and really nobody has stand up to maintain it. It is quite contained and can be left there. Is anyone really using it? - old compression method. It don't work. See last try from Lukas to make a test that works reliabely. I failed with the same task years ago. It is really slow, and if compression is good for you, multifd + zlib is going to perform/compress way more. I don't know what to do with this code, really. * Remove it for this release? It don't work, and haven't work reliabely in quite a few time. * Deprecate it and remove in another couple of releases, i.e. normal deprecation. * Ideas? - -incoming <uri> if you need to set parameters (multifd cames to mind, and preempt has the same problem), you really needs to use defer. So what should we do here? This part is not urget, because management apps have a working option that are already using "defer", and the code simplifacation if we remove it is not so big. So we can leave it until 9.0 or whatever we think fit. What do you think? Later, Juan. Juan Quintela (5): migration: Use proper indentation for migration.json migration: migrate 'inc' command option is deprecated. migration: migrate 'blk' command option is deprecated. migration: Deprecate block migration migration: Deprecate old compression method docs/about/deprecated.rst | 32 ++++++ qapi/migration.json | 203 ++++++++++++++++++++++++-------------- migration/block.c | 3 + migration/migration.c | 11 +++ migration/options.c | 22 ++++- 5 files changed, 198 insertions(+), 73 deletions(-) base-commit: 5f9dd6a8ce3961db4ce47411ed2097ad88bdf5fc prerequisite-patch-id: 99c8bffa9428838925e330eb2881bab476122579 prerequisite-patch-id: 77ba427fd916aeb395e95aa0e7190f84e98e96ab prerequisite-patch-id: 9983d46fa438d7075a37be883529e37ae41e4228 prerequisite-patch-id: 207f7529924b12dcb57f6557d6db6f79ceb2d682 prerequisite-patch-id: 5ad1799a13845dbf893a28a202b51a6b50d95d90 prerequisite-patch-id: c51959aacd6d65ee84fcd4f1b2aed3dd6f6af879 prerequisite-patch-id: da9dbb6799b2da002c0896574334920097e4c50a prerequisite-patch-id: c1110ffafbaf5465fb277a20db809372291f7846 prerequisite-patch-id: 8307c92bedd07446214b35b40206eb6793a7384d prerequisite-patch-id: 0a6106cd4a508d5e700a7ff6c25edfdd03c8ca3d prerequisite-patch-id: 83205051de22382e75bf4acdf69e59315801fa0d prerequisite-patch-id: 8c9b3cba89d555c071a410041e6da41806106a7e prerequisite-patch-id: 0ff62a33b9a242226ccc1f5424a516de803c9fe5 prerequisite-patch-id: 25b8ae1ebe09ace14457c454cfcb23077c37346c prerequisite-patch-id: 466ea91d5be41fe345dacd4d17bbbe5ce13118c2 prerequisite-patch-id: d1045858f9729ac62eccf2e83ebf95cfebae2cb5 prerequisite-patch-id: 0276ec02073bda5426de39e2f2e81eef080b4f54 prerequisite-patch-id: 7afb4450a163cc1a63ea23831c50214966969131 prerequisite-patch-id: 06c053ce4f41db9675bd1778ae8f6a483641fcef prerequisite-patch-id: 13ea05d54d741ed08b3bfefa1fc8bedb9c81c782 prerequisite-patch-id: 99c4e2b7101bc8c4b9515129a1bbe6f068053dbf prerequisite-patch-id: 1e393a196dc7a1ee75f3cc3cebbb591c5422102f prerequisite-patch-id: 2cf497b41f5024ede0a224b1f5b172226067a534 prerequisite-patch-id: 2a70276ed61d33fc4f3b52560753c05d1cd413be prerequisite-patch-id: 17ec40f4388b62ba8bf3ac1546c6913f5d1f6079 prerequisite-patch-id: dba969ce9d6cf69c1319661a7d81b1c1c719804d prerequisite-patch-id: 8d800cda87167314f07320bdb3df936c323e4a40 prerequisite-patch-id: 25d4aaf54ea66f30e426fa38bdd4e0f47303c513 prerequisite-patch-id: 082c9d8584c1daff1e827e44ee3047178e7004a7 prerequisite-patch-id: 0ef73900899425ae2f00751347afdce3739aa954 prerequisite-patch-id: e7db4730b791b71aaf417ee0f65fb6304566aaf8 prerequisite-patch-id: 62d7f28f8196039507ffe362f97723395d7bb704 prerequisite-patch-id: ea8de47bcb54e33bcc67e59e9ed752a4d1fad703 prerequisite-patch-id: 497893ef92e1ea56bd8605e6990a05cb4c7f9293 prerequisite-patch-id: 3dc869c80ee568449bbfa2a9bc427524d0e8970b prerequisite-patch-id: 52c14b6fb14ed4ccd685385a9fbc6297b762c0ef prerequisite-patch-id: 23de8371e9e3277c374a47f9bd10de209a22fdd5 prerequisite-patch-id: d21f036dd106af3375fb920bf0a557fe2b86d98e prerequisite-patch-id: ca717076e9de83d6ce370f7374c4729a9f586fae prerequisite-patch-id: a235b6ab3237155f2b39e8e10d47ddd250f6b6cc prerequisite-patch-id: 6db2aa3d8a5804c85dd171864f5140fadf5f72da prerequisite-patch-id: a799b883f4cb41c34ad074220293f372c6e0a9c7 prerequisite-patch-id: 5e012c426aef7b2f07513cec68e7efa1cf85fe52 prerequisite-patch-id: 4e614e7e3395dda7bae5f9fa21257c57cce45a39 prerequisite-patch-id: 67f8e68622c9698280ff5c5dc7469f36daf9a012 prerequisite-patch-id: d86078331449a21499e3f955e27bc87294969346 prerequisite-patch-id: 3f30d10e0ac7f53307f6b462eaf5b47151b73631 prerequisite-patch-id: a5d84769b776873697b1eb18b6b170a168e68133 prerequisite-patch-id: e5058b3e0ca9f80886bd2c1667349bffc6949da6 prerequisite-patch-id: 669d7e2ef30468034acfa33d4da0404caae526a9 prerequisite-patch-id: 3276a659cbe45efca6a6d3a4579af3cf7ceda992 prerequisite-patch-id: 624657b1f538edfb852b09889d6583970665cad9 prerequisite-patch-id: d7d70d557970f203c288f153361c6782245ba9f9 prerequisite-patch-id: fcbab0e48ac1385d2de1be7852b2adb74f04acfc prerequisite-patch-id: 88e76e8dc51b054c84c497344424f24e877e325b prerequisite-patch-id: dc4c193c8571ae5969a6c498edc7cec8ef438bc1 prerequisite-patch-id: 39c1ee32082f6ce1dd088d5a8340ca9b3e2434a4 prerequisite-patch-id: 28deb0caf0f5eac3fc0a866d2901667a56870f6d prerequisite-patch-id: 53b48b35c9b8217b2da5212d7ed48320d355a943 prerequisite-patch-id: 4469f3663714a65a06b7c472ce9c92ab7502a00f prerequisite-patch-id: a75f08b401d251fc3465b65f94a8db8d32d8900a prerequisite-patch-id: 4b7ac86af078a260f656914089da8f43cdaab8ff prerequisite-patch-id: 398f62abad95f55181d2cf8a383f69000de97af4 prerequisite-patch-id: e102cdc3834018fa88f9fe98a78afb46ff316124 prerequisite-patch-id: 1c30c139ef694b9fd8314bffb4b9b2a02c6c9233 prerequisite-patch-id: d96c304f1c63fa840440508f5b3be70a922b2210 prerequisite-patch-id: a8be25a6b6834ac542d40eaec47a60caf2fe545c prerequisite-patch-id: d29aa52f7a6c5e61cf793addbbc7d7ea5f383725 prerequisite-patch-id: c7a6d171e568f4aba6f94126abc6a9a64caefcc2 prerequisite-patch-id: dcbf2e0e9b3b3cd985423993bdd411fc0cdf4646 prerequisite-patch-id: d5f1a450785cb6e8d74e152b7026621cd4077d04 prerequisite-patch-id: 6179fd2a7c7d6866906365b564fcef05428318b3 prerequisite-patch-id: 3f0e5189f1046e8fd37b2f104a5ee6c306438bed prerequisite-patch-id: 9b8f5520663a347e1981c46d1d72f6b7efeef222 prerequisite-patch-id: 6171b4310abc56d03a21f95848beff3f04c04333 prerequisite-patch-id: 93336ba3fd1e3875b644ec6007ef22480df750a2 prerequisite-patch-id: 9a76b6408f38b96af9ad91269a0fac8d1893bdef prerequisite-patch-id: 74c166a9a1ccafef04f3894085a3b3ed5215df7a prerequisite-patch-id: 71833e48cfa5875247770ac8b94ab957e4eab4fe prerequisite-patch-id: 9a14e6755e7d7605267abaeab62d70e651d622e3 prerequisite-patch-id: e0b2ce3211263007de8e2a2b60402cfea4a2f1c2 prerequisite-patch-id: bacccbe583a69dd0f081aa74822e92c23f344a64 prerequisite-patch-id: bee3183ab6c76123bc8795dfd5dd6eb19d417832 prerequisite-patch-id: eee73769e563ea8ad64f82473c235a4fef18ce83 prerequisite-patch-id: 5c2c95e068dc614a7708fe830d773e03e8cde4ec prerequisite-patch-id: deae58b435dc10d80f1ea754613e9ed3e7bd4fe1 prerequisite-patch-id: 1e6e138aeb18a51b6496a265f84f5df1b98471b6 prerequisite-patch-id: 15865988ed0b88b1e28f0e16c50222f61db5ac35 prerequisite-patch-id: 7884031de035d910c1bddee4331a765c6a266243 prerequisite-patch-id: a2deb3751dec34448ab776b455a7b29bd6d8217f prerequisite-patch-id: d24167f841efc3b8fd8afe06ae02da4d4a594fdc prerequisite-patch-id: 4f23aea0e73aa0933a53db59ed716a19dcbd575c prerequisite-patch-id: f54b42bfeb4241cb96b2490e1261e2bc44e7cc07 prerequisite-patch-id: 7e3f3e34be720b25f3db15d2a878bce23b99353c prerequisite-patch-id: fc91b48c6593c862aa17b221663d2bbed9261f16 prerequisite-patch-id: f20dbadd1962f16e7f4fc4a2b8747443ada94f80 prerequisite-patch-id: 78de9ba010ec43b9ebbc998f4d3afb38fed6be8e prerequisite-patch-id: 013c99f721a9a0a4af86772cb8d1d40f6942f16f prerequisite-patch-id: 7ee4a5b056b343ba2d7491158965023af84f56ad prerequisite-patch-id: d489b42dc81bf9dd7a51381c06182ddffb2230e5 prerequisite-patch-id: fcf1400a8d8b417801baf1450c8c10efa06f4481 prerequisite-patch-id: e475e1e9cd7ce746410ef9839d02ba242cb72090 prerequisite-patch-id: 68d24ec2081c2224a1c133f2c07544177e693a53 prerequisite-patch-id: 6e70864f4065b79db49a206523bcc8b4afded934 prerequisite-patch-id: 0d259c5d3ebb259d36c5d059a82df3b0ffbf1429 prerequisite-patch-id: 392a9fa483070625cad85778e4742c4fc5a2ac5d prerequisite-patch-id: 62804c908c4abe71d644f18303780084a4c224e8 prerequisite-patch-id: 3f3f1eed1a6150df53aba846237329cf24bb9548 prerequisite-patch-id: 4d1387c6e00b9c62e638ce955cd5d9681754bfb5 prerequisite-patch-id: 3382e00119d0ecd997ae6f99855c74e3eed9237c prerequisite-patch-id: 95fcef043070fc902f1cad42ef47a94744624530 prerequisite-patch-id: 5b6737d17f3ef9a4ae5d33343125bc597ad2fa62 prerequisite-patch-id: acc0a1e809cb0639e16d4b05cccfd809f8e299b5 prerequisite-patch-id: aa5c2db287402596e20ef0f935aea67007484f58 prerequisite-patch-id: a0318b66bb3f1f096f7d77c3f03e2018f68430b4 prerequisite-patch-id: 4d709e0d8ac627462de259723ac4fcb8efcc5342 prerequisite-patch-id: 811deca81c0cbdc5a3e977dd282f46427e79dbe2 prerequisite-patch-id: 8f66923ad1790ee9e567b9b1d155c7836c3e7cb8 prerequisite-patch-id: c0f2a71d9835e66a216af2ff3b3d434eec44ab0d prerequisite-patch-id: 5e1a47e077d7bd22b1af9439e1cf1ae38830f763 prerequisite-patch-id: 04bd404d9e3268cbc399458be5bd69190852884a prerequisite-patch-id: 6d630be7173e6e8da9a14739d32701f76bdf32a3 prerequisite-patch-id: 463c4f52f60b2c8fbf165caedbbc1bfa3bd2a265 prerequisite-patch-id: 67403a8553d60ec8938906f28319176f2ef0ecc4 prerequisite-patch-id: 18443a910e260eed010a2d4cd8f255678476eb0a prerequisite-patch-id: cf8d1aab1c343ad9bb6de1b980bf7a8aa7479e79 prerequisite-patch-id: cb8ee956876a21478178d46383e760f2a29ec60a prerequisite-patch-id: 0384e88e9105ce6907f44a55ae0d22bb57b11701 prerequisite-patch-id: 010b9094c8a9b1b41dc49fc07d9704a7be6374c0 prerequisite-patch-id: 3e96fcf9486ad8decca891534d4d2b41f786087a prerequisite-patch-id: d77c491a6a5760ca828ecbb1445a77dcf9bebf0b prerequisite-patch-id: 5c2e9b005429bca543ac6dd39912731d9388eb10 prerequisite-patch-id: 741c7b38494d42817d2d71adb6f267268c9cb208 prerequisite-patch-id: b97fb8b1e5848e8561fc599ef7173b2b07782918 prerequisite-patch-id: cca04ee447a117242679dc946638dd876bbaf931 prerequisite-patch-id: 7e7784bd5ec5ecfdb8d7130975a915fb88e8c26b prerequisite-patch-id: 5a5137d28df7153718ef924d49a821fc1482b220 prerequisite-patch-id: 3d010e879709b5540948b11c2692a28fd5bdd1ea prerequisite-patch-id: 3d418aca0f2a4a5a3e8cbd3c9da2a5229dd26f61 prerequisite-patch-id: 423c72136d6c85888dfac083efb54b518323f0dd prerequisite-patch-id: 099453248d834931415e431e1bb470c1f99cdfa2 prerequisite-patch-id: 9fde172c51e107415194ecce2a3e218d2fab7f60 prerequisite-patch-id: 602a0f6b0121ef0296a3fe14872d59b8a0673b24 prerequisite-patch-id: ded33eb3b89b9da9e7a32ca5c6da3da2b65d3a83 prerequisite-patch-id: 56baaaf053e49e6306c076a80c5e7759a7c27805 prerequisite-patch-id: ec1ace1ef1e30d4c56143b3148b4f70c123ddd85 prerequisite-patch-id: da789135fed934d00e9020a90ec700a273fb18fa prerequisite-patch-id: ca5e644043851df5c7472b4149806ac98b6cce5c prerequisite-patch-id: d4f92797793802ce3021c4d1b45d2d0a94c51f07 prerequisite-patch-id: 992ab3fb9e82572494ff6f8af494ffbe8ba5cc6e prerequisite-patch-id: 8baf34ed9789ac6a26f1d84648869131cea522fa prerequisite-patch-id: 63f23c96115916e7707201d828fcab42ceeea385 prerequisite-patch-id: 7c166511597619b0f03043ce3a0a7237032bf7e0 prerequisite-patch-id: 35e2044bb5d5ea5d041ed01579943f6cffa6ee41 prerequisite-patch-id: 497b25db87c4c64173167f70d3a48154e44ca655 prerequisite-patch-id: d78941852e275e8b8ed03254a89324fef00fcf18 prerequisite-patch-id: 3cc8bd3f0886b6dca9197bfdba4bfa6ff360bf24 prerequisite-patch-id: 61890eaa88bcab4ac0aa2ef9a131d56ef8376f1d prerequisite-patch-id: 097b002021ddd12f7b5180ccaa744ecce925f04b prerequisite-patch-id: f599ecb06efafb8954fc9ad6d08a9819da860d28 prerequisite-patch-id: 484f86ad1f4fb5d8b2debfb1e7a8c7b6d0610f77 prerequisite-patch-id: 52db9f2823a1ad78ffb91f84911cd9963b295465 prerequisite-patch-id: d936469bba0e3720bf957995c0f842e56c815e85 prerequisite-patch-id: 9bfb8fba3a480dd5c8878fd307d96cbaaf521cff prerequisite-patch-id: 13798977298ceb264b789af0eae36c714b0d17c1 prerequisite-patch-id: fc68338d9f90388d062471e46e9b691b00302c69 prerequisite-patch-id: 25e5e3c9ec0a10aa564b3cf32fe793aaf1e705b7 prerequisite-patch-id: 9160fde4ddf465965328264e443638a3ab0d09d9 prerequisite-patch-id: 20d490f27f569e5784d5501d842b4be8a4931127 prerequisite-patch-id: 9b7866c753c962fa8107eeff4d25ff40a546f329 prerequisite-patch-id: 653af78a35e216c7dc891a2d46849bdde83a5dfd prerequisite-patch-id: f27f61687c1f423d4ad8f690a5114644364d26c5 prerequisite-patch-id: 705f5636837961012d4ad7cef93e3c06bf2828ad prerequisite-patch-id: cf18ec6cc3cfb012e68e34f5319e5ca5fc08b04f prerequisite-patch-id: 496d56c7025c252650cef84afef17c1cbe761011 prerequisite-patch-id: 849633dc3d51365926008341078b46e05349daf3 prerequisite-patch-id: bdd1c3731521ab2bec54b5757a1b1460ffa8a76b prerequisite-patch-id: 7a4af5cc7a8d0c73fac182936c3034b8b97a1d81 prerequisite-patch-id: b6640f64140c35ef6614a47ac213d815eaacc385 prerequisite-patch-id: 619f2ef543c43d0e537cc5ec16a88aff8d08f7ee prerequisite-patch-id: 5b7d7481f225dd506c53bc58d913b3dcf670ab3b prerequisite-patch-id: 76b2c41e04d00656cff256f72fb81617baf75004 prerequisite-patch-id: e1e44b6305e28dc040a7495749756d39f086b407 prerequisite-patch-id: 23b6508f200dc43698cc460285ec47fef2e54a45 prerequisite-patch-id: b225a20694d23a03f11eab8c86a0a4b7b640a302 prerequisite-patch-id: e630536287ec238942c1948f8b966e15384fd3ff prerequisite-patch-id: 327ccf1526eb31e0899de28c42c6bc687e274be5 prerequisite-patch-id: 6b4ab77555a60de86ad045538ea19460e0f65a27 prerequisite-patch-id: e9766937f032e867e3953ea53c47a5c385c68feb prerequisite-patch-id: b6f9c8b0ac1722d3809bc48d89ace7070e1c447a prerequisite-patch-id: e72efe42eec650c70433a02ce9c97ddeaef02d0d prerequisite-patch-id: 9f17b908169ba05390869f3e35b69df00bd46d41 prerequisite-patch-id: b9a82d490d17914a2f80b0430cf4973dd93ccd2f prerequisite-patch-id: 2563a1dcb7798936aa2c4a83dc1e1ddd585af241 prerequisite-patch-id: d4e0829e923f60dbf80b39493879280c8da2ff4e prerequisite-patch-id: e42a585260f999d56d222e7b2f44405f6cfbc406 prerequisite-patch-id: e163a8cb28f70824dcde6295354df58a9ece12c0 prerequisite-patch-id: fb1ecde59655a27c8d3fdff20a66cbbe3f00bd6d prerequisite-patch-id: 8cb6ee4b61ec57e6972ac1ee1253e85a7765deaa prerequisite-patch-id: 499ac0cc3c1b5a08c8609ecc7d210c35edf01370 prerequisite-patch-id: 8434161ce61b9b53baf7c2643709e08bede8891d prerequisite-patch-id: bf01608b5710ec0f4d041056988bf42e8785b7be prerequisite-patch-id: 31a846018ddc61b29dffd1c56e8ef29c5aeb164b prerequisite-patch-id: 1a0ab80ff0cde1bf49af90be105764d6504c42e2 prerequisite-patch-id: 4463e631ff73f48de1f761fa08fc2d3a0d02d2e3 prerequisite-patch-id: 1ef269c11829325108dc950ebb6ebbb0413f491d prerequisite-patch-id: 244d96e340cb984ccaeb47ba1fc32c093df85877 prerequisite-patch-id: 6490e0a9923c2341d6aa355576fc178e830a10ef prerequisite-patch-id: 73099e3b819e51e70cedf57b5de2da94161a789b prerequisite-patch-id: 49c793919ad92fe3162b6cc8efac6762037534e1 prerequisite-patch-id: 53796f63653ecdf3f2a66d9cb3181546441d4ac0 prerequisite-patch-id: aa6fbd949a032b6fce2b599309f633393bc0bb08 prerequisite-patch-id: eb33de06c18bd23ef820d12cd5e340eda4fc15dc prerequisite-patch-id: 9acaaae21935bd460bd45f89ac9e5b3c7be398fc prerequisite-patch-id: d00c2306f14a27317918b63539f65df88ee08222 prerequisite-patch-id: 87cb389190ca57ff8250be430e3470b39575271d prerequisite-patch-id: 2eaee2a99c51fd5a0df72b5253e8064d9facbcd0 prerequisite-patch-id: fa319f93ccd1f3f07955a69b793d0c3ca697fe56 prerequisite-patch-id: 8541186582e59ab7fc5b8242042d068b5ff344ec prerequisite-patch-id: 02406627f62825a368975d64a3da2c68fafeccea prerequisite-patch-id: 5ff0c64a0f40ad9c17a67f3ec4af3c24ca81ba7c prerequisite-patch-id: 7f2ccb5fa7573dd10b4dec4d9b3dda8c5416e77e prerequisite-patch-id: f32307884ffd5b79bb333fffbf7a1a1fb11e1077 prerequisite-patch-id: dc6d9a25a341dbd7ec34453b5692f0c4ee0e5ebd prerequisite-patch-id: fdc3da57663352fd762b6ea8b3fb39545cd86f69 prerequisite-patch-id: 93933d68c7698bf5c66aaff4b9e61b8a7cd49deb prerequisite-patch-id: 601286c6aae0c275b6ebc489197c21f6425d1dea prerequisite-patch-id: b6bd48dfa8f1d956be0a63ccc27e0f2648ea6188 prerequisite-patch-id: d7bc5f0deb3489e698b5d93d756bb41fe334229e prerequisite-patch-id: 3f3d8b03dc8e39e30049f94c234fb32333bea7ab prerequisite-patch-id: e7e5398f510b2490efec81bc227ab3a66fda6db0 prerequisite-patch-id: db92723389041e01bed4d3cab7d800bd0060d44d prerequisite-patch-id: 7ba892dca22bd88cb2b4f03e9c7ec3ab4828f365 prerequisite-patch-id: 56aac78c79b3a4329e7014d173c8f6edea4ebee1 prerequisite-patch-id: 10e17f897a2bb483d2cd0038598e5e2f08514e4a prerequisite-patch-id: dfb16a3bd2e302f02dd89fd4337446b454100ed4 prerequisite-patch-id: 145f9e823ba743c9bf1c3f9abcdd1d4648a82d53 prerequisite-patch-id: f7152653caf4f759f0537fc8f7898261e839261a prerequisite-patch-id: e727e63dd83f98fc829b6b74a11d7f936950aa14 prerequisite-patch-id: c5e20e303c45ddc096195a9d7c5c2cc2432f0290 prerequisite-patch-id: f448aa53083685570eb21b735641430a91610921 prerequisite-patch-id: 4e47d050a1ae9e74cfe36e050a3e0dace07b0409 prerequisite-patch-id: d6a6d1fa1758545ac55632916786db38b684e652 prerequisite-patch-id: 3d5f7033fe09ae00a22ec916ed8105ed3be786b5 prerequisite-patch-id: c6a7f29dbf64603b76a5a7f6f518c91c8fa69039 prerequisite-patch-id: 2c3aaf492801acbeace899e8be217cc8035f5c7c prerequisite-patch-id: b3f3d12ed51b06b67a96c4b3663e7ade34f3adc5 prerequisite-patch-id: f0a12ddd1e70bc59307a38578b188a2eea485c13 prerequisite-patch-id: 6be34e0afc39be8a9afdb774869d69775541cac0 prerequisite-patch-id: fa5ad2a2e69c8d3dc9b93a2f4cea9d3bbd92c0e5 prerequisite-patch-id: 80b7366854987ae24fd8ed927c3ab5907adc60f3 prerequisite-patch-id: 177b9fdde3af8da75906b625305bd5847eacfa49 prerequisite-patch-id: ec22cfd443b6d05e5877fbb2ee30eb137263c7bf prerequisite-patch-id: 5f70ec5094411544e135a98f86d4a4c127066af0 prerequisite-patch-id: 7f772f41522a420c0cdc7d5364360bea4d3039a5 prerequisite-patch-id: 5de29a882f6098628e28546fc428b8001a2982d6 prerequisite-patch-id: 6e47d332e95e4cf9a3035fb998fc33976a4248a7 prerequisite-patch-id: b1c10157994954d23ee292a9a47f0ce1141ae00b prerequisite-patch-id: 5d61f469e90cba8e1bee425221833fe7735f101a prerequisite-patch-id: aa12cd1065688dfd5c494fa3aab702353f984ed9 prerequisite-patch-id: 5cd9213fe4add5a27f75b8c53ab6273284912314 prerequisite-patch-id: 2b70a980645981bf08f09ae5ae904fabd91f06b4 prerequisite-patch-id: f3ad290f5818d0dc77bb80be76c3a5afd0c895e7 prerequisite-patch-id: f8f8e9b4fa84f6592dc0ec61cfb499b8a4dd34fe prerequisite-patch-id: 2e0f2765db4c61542cb6f77afd0a6c96b4a96472 prerequisite-patch-id: 0bddb6b3ccb1ada7ab375b818262f4688d85b29c prerequisite-patch-id: 6ade180f5ea4a054d8daea916cb56139a9e76534 prerequisite-patch-id: b59491087baa3ae50e93132d7c3f9757a9649c52 prerequisite-patch-id: 945182b64bab405af5aaec7d7f52c2a164c810eb prerequisite-patch-id: 063d9ededd9f3d72340f5738c972e0803e3cdc96 prerequisite-patch-id: 8b80819a5b41866ad1aa2f5c171845a475b04484 prerequisite-patch-id: 38dcab15193713c2a59f5ac6b648aff53e6a36aa prerequisite-patch-id: cc186287e3a5e027d3c6bb405a0e80a0036fab33 -- 2.40.1

4 10

[PATCH v1] ci: disable usage of libattr in Leap
by Olaf Hering 06 Jul '23

06 Jul '23

Commit dffeef89ef ("meson: attr_dep switch to dependency()") made libattr.pc mandatory. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- ci/containers/opensuse-leap-15.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile index ca11edf808..4bfbe8057f 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -37,7 +37,6 @@ RUN zypper update -y && \ kmod \ libacl-devel \ libapparmor-devel \ - libattr-devel \ libblkid-devel \ libcap-ng-devel \ libcurl-devel \ @@ -95,3 +94,4 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +ENV MESON_OPTS "-Dattr=disabled"

5 5

[libvirt PATCH v2 0/4] Enable asynchronous teardown
by Boris Fiuczynski 03 Jul '23

03 Jul '23

Update capabilities for QEMU 8.1 on s390x, add a new capability async-teardown and make use of it when running on s390x hosts to improve memory reclaiming. v2: - switch to use on/off on the QEMU command line - added configuration management of the feature to the domain XML Boris Fiuczynski (3): qemu: add run-with async-teardown capability qemu: allow use of async teardown in domain qemu: enable asynchronous teardown on s390x hosts Shalini Chellathurai Saroja (1): tests: add capabilities for QEMU 8.1.0 on s390x docs/formatdomain.rst | 6 + src/conf/domain_conf.c | 22 + src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 9 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 20 + src/qemu/qemu_domain.c | 14 + src/qemu/qemu_validate.c | 9 + tests/domaincapsdata/qemu_8.1.0.s390x.xml | 285 + .../caps_8.1.0_s390x.replies | 34594 ++++++++++++++++ .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 3719 ++ .../caps_8.1.0_x86_64.xml | 1 + .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 2 +- ...ith-2-ccw-virtio+ccw-virtio-1-explicit.xml | 1 - ...with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 2 +- ...otplug-base-ccw-live-with-2-ccw-virtio.xml | 2 +- ...-with-ccw-virtio+ccw-virtio-2-explicit.xml | 2 +- ...-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 2 +- ...uhotplug-base-ccw-live-with-ccw-virtio.xml | 2 +- .../qemuhotplug-base-ccw-live.xml | 2 +- .../async-teardown.x86_64-latest.args | 37 + tests/qemuxml2argvdata/async-teardown.xml | 31 + .../balloon-ccw-deflate.s390x-latest.args | 3 +- .../console-sclp.s390x-latest.args | 7 +- .../console-virtio-ccw.s390x-latest.args | 9 +- .../cpu-s390-features.s390x-latest.args | 1 + .../cpu-s390-zEC12.s390x-latest.args | 1 + ...default-video-type-s390x.s390x-latest.args | 5 +- .../disk-error-policy-s390x.s390x-latest.args | 7 +- .../disk-virtio-ccw-many.s390x-latest.args | 11 +- .../disk-virtio-ccw.s390x-latest.args | 7 +- .../disk-virtio-s390-zpci.s390x-latest.args | 7 +- .../fs9p-ccw.s390x-latest.args | 11 +- ...tdev-scsi-vhost-scsi-ccw.s390x-latest.args | 9 +- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 5 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 5 +- ...dev-subsys-mdev-vfio-ccw.s390x-latest.args | 5 +- ...o-zpci-autogenerate-fids.s390x-latest.args | 11 +- ...o-zpci-autogenerate-uids.s390x-latest.args | 11 +- ...v-vfio-zpci-autogenerate.s390x-latest.args | 7 +- ...dev-vfio-zpci-boundaries.s390x-latest.args | 15 +- ...vfio-zpci-ccw-memballoon.s390x-latest.args | 9 +- ...io-zpci-multidomain-many.s390x-latest.args | 35 +- .../hostdev-vfio-zpci.s390x-latest.args | 7 +- .../input-virtio-ccw.s390x-latest.args | 11 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 9 +- .../launch-security-s390-pv.s390x-latest.args | 7 +- ...chine-aeskeywrap-off-cap.s390x-latest.args | 3 +- ...hine-aeskeywrap-off-caps.s390x-latest.args | 3 +- ...achine-aeskeywrap-on-cap.s390x-latest.args | 3 +- ...chine-aeskeywrap-on-caps.s390x-latest.args | 3 +- ...chine-deakeywrap-off-cap.s390x-latest.args | 3 +- ...hine-deakeywrap-off-caps.s390x-latest.args | 3 +- ...achine-deakeywrap-on-cap.s390x-latest.args | 3 +- ...chine-deakeywrap-on-caps.s390x-latest.args | 3 +- ...achine-keywrap-none-caps.s390x-latest.args | 3 +- .../machine-keywrap-none.s390x-latest.args | 3 +- ...machine-loadparm-hostdev.s390x-latest.args | 5 +- ...multiple-disks-nets-s390.s390x-latest.args | 15 +- ...achine-loadparm-net-s390.s390x-latest.args | 7 +- .../machine-loadparm-s390.s390x-latest.args | 5 +- .../net-virtio-ccw.s390x-latest.args | 11 +- ...low-bogus-usb-controller.s390x-latest.args | 11 +- ...390-allow-bogus-usb-none.s390x-latest.args | 11 +- ...0-async-teardown-disabled.s390x-6.0.0.args | 35 + ...-async-teardown-disabled.s390x-latest.args | 36 + .../s390-async-teardown-disabled.xml | 24 + ...async-teardown-no-attrib.s390x-latest.args | 36 + .../s390-async-teardown-no-attrib.xml | 24 + .../s390-async-teardown.s390x-6.0.0.err | 1 + .../s390-async-teardown.s390x-latest.args | 36 + .../qemuxml2argvdata/s390-async-teardown.xml | 24 + ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 5 +- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 3 +- ...no-async-teardown-autogen.s390x-6.0.0.args | 32 + ...o-async-teardown-autogen.s390x-latest.args | 33 + .../s390-no-async-teardown-autogen.xml | 18 + .../s390-panic-missing.s390x-latest.args | 7 +- .../s390-panic-no-address.s390x-latest.args | 7 +- .../s390-serial-2.s390x-latest.args | 5 +- .../s390-serial-console.s390x-latest.args | 3 +- .../s390-serial.s390x-latest.args | 3 +- .../s390x-ccw-graphics.s390x-latest.args | 23 +- .../s390x-ccw-headless.s390x-latest.args | 17 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 7 +- .../vhost-vsock-ccw-iommu.s390x-latest.args | 7 +- .../vhost-vsock-ccw-iommu.xml | 3 + .../vhost-vsock-ccw.s390x-latest.args | 7 +- .../video-virtio-gpu-ccw.s390x-latest.args | 9 +- .../virtio-rng-ccw.s390x-latest.args | 11 +- .../watchdog-diag288.s390x-latest.args | 7 +- tests/qemuxml2argvtest.c | 9 + .../async-teardown.x86_64-latest.xml | 44 + .../default-video-type-s390x.s390x-latest.xml | 3 + .../disk-virtio-s390-zpci.s390x-latest.xml | 3 + ...stdev-scsi-vhost-scsi-ccw.s390x-latest.xml | 3 + ...stdev-subsys-mdev-vfio-ap.s390x-latest.xml | 3 + ...subsys-mdev-vfio-ccw-boot.s390x-latest.xml | 3 + ...tdev-subsys-mdev-vfio-ccw.s390x-latest.xml | 3 + ...io-zpci-autogenerate-fids.s390x-latest.xml | 3 + ...io-zpci-autogenerate-uids.s390x-latest.xml | 3 + ...ev-vfio-zpci-autogenerate.s390x-latest.xml | 3 + ...tdev-vfio-zpci-boundaries.s390x-latest.xml | 3 + ...-vfio-zpci-ccw-memballoon.s390x-latest.xml | 3 + ...fio-zpci-multidomain-many.s390x-latest.xml | 3 + .../hostdev-vfio-zpci.s390x-latest.xml | 3 + .../input-virtio-ccw.s390x-latest.xml | 3 + ...iothreads-disk-virtio-ccw.s390x-latest.xml | 3 + ...iothreads-virtio-scsi-ccw.s390x-latest.xml | 3 + .../machine-loadparm-hostdev.s390x-latest.xml | 3 + ...-multiple-disks-nets-s390.s390x-latest.xml | 3 + ...90-async-teardown-disabled.s390x-6.0.0.xml | 36 + ...0-async-teardown-disabled.s390x-latest.xml | 36 + ...-async-teardown-no-attrib.s390x-latest.xml | 36 + .../s390-async-teardown.s390x-latest.xml | 36 + ...lt-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml | 3 + ...lt-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml | 3 + ...lt-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml | 3 + ...lt-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml | 3 + .../s390-defaultconsole.s390x-latest.xml | 3 + ...-no-async-teardown-autogen.s390x-6.0.0.xml | 25 + ...no-async-teardown-autogen.s390x-latest.xml | 28 + .../s390-panic-missing.s390x-latest.xml | 3 + .../s390-panic-no-address.s390x-latest.xml | 3 + .../s390-panic.s390x-latest.xml | 3 + .../s390-serial-2.s390x-latest.xml | 3 + .../s390-serial-console.s390x-latest.xml | 3 + .../s390-serial.s390x-latest.xml | 3 + .../s390x-ccw-graphics.s390x-latest.xml | 3 + .../s390x-ccw-headless.s390x-latest.xml | 3 + .../vhost-vsock-ccw-auto.s390x-latest.xml | 3 + .../vhost-vsock-ccw.s390x-latest.xml | 3 + ...video-virtio-gpu-ccw-auto.s390x-latest.xml | 3 + .../video-virtio-gpu-ccw.s390x-latest.xml | 3 + tests/qemuxml2xmltest.c | 8 + 138 files changed, 39671 insertions(+), 197 deletions(-) create mode 100644 tests/domaincapsdata/qemu_8.1.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml create mode 100644 tests/qemuxml2argvdata/async-teardown.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/async-teardown.xml create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-6.0.0.args create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-disabled.xml create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-no-attrib.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-no-attrib.xml create mode 100644 tests/qemuxml2argvdata/s390-async-teardown.s390x-6.0.0.err create mode 100644 tests/qemuxml2argvdata/s390-async-teardown.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-async-teardown.xml create mode 100644 tests/qemuxml2argvdata/s390-no-async-teardown-autogen.s390x-6.0.0.args create mode 100644 tests/qemuxml2argvdata/s390-no-async-teardown-autogen.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-no-async-teardown-autogen.xml create mode 100644 tests/qemuxml2xmloutdata/async-teardown.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-6.0.0.xml create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown-no-attrib.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390-no-async-teardown-autogen.s390x-6.0.0.xml create mode 100644 tests/qemuxml2xmloutdata/s390-no-async-teardown-autogen.s390x-latest.xml -- 2.41.0

4 11

[PATCH] NEWS: Fix vertical spacing
by Andrea Bolognani 03 Jul '23

03 Jul '23

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. NEWS.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index cafdb4a773..f0792f4094 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -78,7 +78,6 @@ v9.5.0 (2023-07-03) to access all configured NUMA nodes of the VM rather than just the one where it's supposed to be pinned. - * qemu: Fix setup of ``hostdev`` backed ``<interface>`` The proper steps to initialize the host device were skipped for interfaces @@ -551,6 +550,7 @@ v8.10.0 (2022-12-01) Certain udev entries might be of a size that makes libudev emit EINVAL which caused a busy loop burning CPU. Fix it by ignoring the return code. + v8.9.0 (2022-11-01) =================== @@ -729,6 +729,7 @@ v8.6.0 (2022-08-01) The firmware autoselection feature now behaves more intuitively, reports better error messages on failure and comes with high-level documentation. + v8.5.0 (2022-07-01) =================== -- 2.41.0

1 0

Release of libvirt-9.5.0
by Jiri Denemark 03 Jul '23

03 Jul '23

The 9.5.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://download.libvirt.org/ https://download.libvirt.org/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * New features * qemu: Allow configuring the ``discard-no-unref`` feature of ``qcow2`` driver The new ``discard_no_unref`` attribute of the ``disk`` ``driver`` element controls whether the ``qcow2`` driver in qemu unrefs clusters inside the image on discard requests. Disabling cluster unrefing decreases fragmentation of the image. * Improvements * qemu: Include maximum physical address size in baseline CPU When computing a baseline CPU definition for a set of hosts, we need to include maximum physical address size in the result to make sure it is compatible with all hosts even if their supported physical address sizes differ. * conf: Properly handle slots for non-DIMM ``<memory>`` devices Memory devices such as ``virtio-mem`` don't need a memory slot as they are PCI devices. ``libvirt`` now properly accounts the memory slots for such devices as well as specifying the ``slots`` attribute of the ``<maxMemory>`` element is no longer needed unless DIMM-like devices are to be used. * ``passt`` log and port forwarding improvements Libvirt now ensures that the ``passt`` helper process can access the configured log file even when it's placed in a directory without permissions. The ``<portForward>`` element of a passt-backed interface can now omit the ``address`` attribute as it's enough to specify a ``dev``. * Bug fixes * lxc: Allow seeking in ``/proc/meminfo`` to resove failure with new ``procps`` package New version of the ``free`` command from ``procps`` package seeks into the ``/proc/meminfo`` file, which was not supported by the instance of the file exposed via LXC causing a failure. * qemu: Fix rare race-condition when detaching a device The device removal handler callback function didn't re-check the state of the unplug operation after a timeout, which could rarely cause that the device was removed from the VM but not the definition. * qemu: Fix NUMA memory allocation logic QEMU allocates memory via the emulator thread thus that has to be allowed to access all configured NUMA nodes of the VM rather than just the one where it's supposed to be pinned. * qemu: Fix setup of ``hostdev`` backed ``<interface>`` The proper steps to initialize the host device were skipped for interfaces due to a logic bug preventing start of VM which used them. Enjoy. Jirka

1 0

[PATCH] os-posix: Allow 'chroot' via '-run-with' and deprecate the old '-chroot' option
by Thomas Huth 30 Jun '23

30 Jun '23

We recently introduced "-run-with" for options that influence the runtime behavior of QEMU. This option has the big advantage that it can group related options (so that it is easier for the users to spot them) and that the options become introspectable via QMP this way. So let's start moving more switches into this option group, starting with "-chroot" now. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- docs/about/deprecated.rst | 5 +++++ os-posix.c | 35 ++++++++++++++++++++++++++++++++++- util/async-teardown.c | 21 --------------------- qemu-options.hx | 18 +++++++++++++----- 4 files changed, 52 insertions(+), 27 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 0743459862..1cf53b86ce 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -116,6 +116,11 @@ Use "whpx" (on Windows) or "hvf" (on macOS) instead. Use ``-run-with async-teardown=on`` instead. +``-chroot`` (since 8.1) +''''''''''''''''''''''' + +Use ``-run-with chroot=dir`` instead. + ``-singlestep`` (since 8.1) ''''''''''''''''''''''''''' diff --git a/os-posix.c b/os-posix.c index 90ea71725f..0ae1fb2347 100644 --- a/os-posix.c +++ b/os-posix.c @@ -38,6 +38,7 @@ #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/option.h" +#include "qemu/module.h" #ifdef CONFIG_LINUX #include <sys/prctl.h> @@ -148,6 +149,7 @@ int os_parse_cmd_args(int index, const char *optarg) } break; case QEMU_OPTION_chroot: + warn_report("option is deprecated, use '-run-with chroot=...' instead"); chroot_dir = optarg; break; case QEMU_OPTION_daemonize: @@ -158,18 +160,25 @@ int os_parse_cmd_args(int index, const char *optarg) case QEMU_OPTION_asyncteardown: init_async_teardown(); break; +#endif case QEMU_OPTION_run_with: { + const char *str; QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("run-with"), optarg, false); if (!opts) { exit(1); } +#if defined(CONFIG_LINUX) if (qemu_opt_get_bool(opts, "async-teardown", false)) { init_async_teardown(); } +#endif + str = qemu_opt_get(opts, "chroot"); + if (str) { + chroot_dir = str; + } break; } -#endif default: return -1; } @@ -348,3 +357,27 @@ int os_mlock(void) return -ENOSYS; #endif } + +static QemuOptsList qemu_run_with_opts = { + .name = "run-with", + .head = QTAILQ_HEAD_INITIALIZER(qemu_run_with_opts.head), + .desc = { +#if defined(CONFIG_LINUX) + { + .name = "async-teardown", + .type = QEMU_OPT_BOOL, + }, +#endif + { + .name = "chroot", + .type = QEMU_OPT_STRING, + }, + { /* end of list */ } + }, +}; + +static void register_teardown(void) +{ + qemu_add_opts(&qemu_run_with_opts); +} +opts_init(register_teardown); diff --git a/util/async-teardown.c b/util/async-teardown.c index 3ab19c8740..62cdeb0f20 100644 --- a/util/async-teardown.c +++ b/util/async-teardown.c @@ -12,9 +12,6 @@ */ #include "qemu/osdep.h" -#include "qemu/config-file.h" -#include "qemu/option.h" -#include "qemu/module.h" #include <dirent.h> #include <sys/prctl.h> #include <sched.h> @@ -147,21 +144,3 @@ void init_async_teardown(void) clone(async_teardown_fn, new_stack_for_clone(), CLONE_VM, NULL); sigprocmask(SIG_SETMASK, &old_signals, NULL); } - -static QemuOptsList qemu_run_with_opts = { - .name = "run-with", - .head = QTAILQ_HEAD_INITIALIZER(qemu_run_with_opts.head), - .desc = { - { - .name = "async-teardown", - .type = QEMU_OPT_BOOL, - }, - { /* end of list */ } - }, -}; - -static void register_teardown(void) -{ - qemu_add_opts(&qemu_run_with_opts); -} -opts_init(register_teardown); diff --git a/qemu-options.hx b/qemu-options.hx index b57489d7ca..f49d4c0e3c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4670,11 +4670,12 @@ ERST #ifndef _WIN32 DEF("chroot", HAS_ARG, QEMU_OPTION_chroot, \ - "-chroot dir chroot to dir just before starting the VM\n", + "-chroot dir chroot to dir just before starting the VM (deprecated)\n", QEMU_ARCH_ALL) #endif SRST ``-chroot dir`` + Deprecated, use '-run-with chroot=...' instead. Immediately before starting guest execution, chroot to the specified directory. Especially useful in combination with -runas. ERST @@ -4861,13 +4862,16 @@ SRST This option is deprecated and should no longer be used. The new option ``-run-with async-teardown=on`` is a replacement. ERST +#endif +#ifdef CONFIG_POSIX DEF("run-with", HAS_ARG, QEMU_OPTION_run_with, - "-run-with async-teardown[=on|off]\n" - " misc QEMU process lifecycle options\n" - " async-teardown=on enables asynchronous teardown\n", + "-run-with [async-teardown=on|off][,chroot=dir]\n" + " Set miscellaneous QEMU process lifecycle options:\n" + " async-teardown=on enables asynchronous teardown (Linux only)\n" + " chroot=dir chroot to dir just before starting the VM\n", QEMU_ARCH_ALL) SRST -``-run-with`` +``-run-with [async-teardown=on|off][,chroot=dir]`` Set QEMU process lifecycle options. ``async-teardown=on`` enables asynchronous teardown. A new process called @@ -4880,6 +4884,10 @@ SRST performed correctly. This only works if the cleanup process is not forcefully killed with SIGKILL before the main QEMU process has terminated completely. + + ``chroot=dir`` can be used for doing a chroot to the specified directory + immediately before starting the guest execution. This is especially useful + in combination with -runas. ERST #endif -- 2.39.3

4 4

[PATCH v6] vfio/pci: Propagate ACPI notifications to user-space via eventfd
by Grzegorz Jaszczyk 30 Jun '23

30 Jun '23

To allow pass-through devices receiving ACPI notifications, permit to register ACPI notify handler (via VFIO_DEVICE_SET_IRQS) for a given device. The handler role is to receive and propagate such ACPI notifications to the user-space through the user provided eventfd. This allows VMM to receive and propagate them further to the VM, where the actual driver for pass-through device resides and can react to device specific notifications accordingly. The eventfd usage ensures VMM and device isolation: it allows to use a dedicated channel associated with the device for such events, such that the VMM has direct access. Since the eventfd counter is used as ACPI notification value placeholder, the eventfd signaling needs to be serialized in order to not end up with notification values being coalesced. Therefore ACPI notification values are buffered and signalized one by one, when the previous notification value has been consumed. Signed-off-by: Grzegorz Jaszczyk <jaz(a)semihalf.com> --- Changelog v5..v6 - Get rid of #if IS_ENABLED(CONFIG_ACPI) from vfio_pci_intrs.c - There is no need to keep vfio_acpi_notification struct definition in header, make it private and move to cpi_notify.c - Add lockdep_asserts in acpi_notification_dequeue - notification_list_lock was not initialized which triggers some warning with CONFIG_DEBUG_MUTEXES enabled (it was not logical error since mentioned mutex was zeroed thanks to kzalloc it is just DEBUG_MUTEXES performs extra checks and sets lock->magic). - Change notification_lock from mutex to semaphore (notification_sem). The logic was working fine with the mutex but enabling lockdep support made me realize that the mutex has to be released by the same task which acquires it and it is checked with lockdep enabled. Semaphore does not have such a restriction. - In order to correctly handle some sequences such as: * user configures a notification eventfd * a notification fires * the user closes the eventfd without reading it, and then tries to swap in a different eventfd ctx separate the entire eventfd context together with notification_sem from the main vfio_acpi_notification struct. Thanks to that entire, separate eventfd ctx could be swapped leaving the previous eventfd ctx untouched. The new eventfd has its separate notification_sem initialized and will not depend on previous eventfd ctx. Additionally when the last handle to old eventfd will be released and EPOLLHUP triggered, old eventfd ctx will be cleaned-up. - Together with the above add support for required EPOLLHUP handling. - Add missing fput invocations. - Move some common code into vfio_acpi_eventfd_init and use it during registration and eventfd swapping. - v5: https://patchwork.kernel.org/project/kvm/patch/20230609133950.2197552-1-jaz… Changelog v4..v5 Address Alex Williamson's feedback: - s/vfio_acpi_notify.{c,o}/acpi_notify.{c,o} - Do not put acpi_notify to its own module but fold it into main vfio.ko. Additionally select it from VFIO_PCI_CORE instead of VFIO_PCI. - Cleanup acpi notify under igate mutex (in vfio_pci_core_close_device). - Add extra check for ACPI companion in vfio_pci_get_irq_count and extend vfio_pci_ioctl_get_irq_info. - Drop acpi.h include - linux/vfio_acpi_notify.h includes it already. - Send device check notification value for DATA_NONE and non-zero count and for DATA_BOOL and non-zero count (as for loopback testing). - Drop some redundant !acpi_notify->acpi_notify_trigger checks. - Move some common code to new helper functions: 1) acpi_notification_dequeue 2) vfio_acpi_notify_cleanup and rename previous vfio_acpi_notify_cleanup into vfio_remove_acpi_notify which uses it - Add rate limited logging for dropped notifications. - Move vdev->acpi_notification pointer cleanup to the vfio_acpi_notify_cleanup function this also fixes two bigger issues caught by Alex. - Allow the eventfd to be swapped. - s/GFP_KERNEL/GFP_KERNEL_ACCOUNT. - s/VFIO_PCI_ACPI_NTFY_IRQ_INDEX/VFIO_PCI_ACPI_IRQ_INDEX. - Add header protection for multiple includes. - v4: https://patchwork.kernel.org/project/kvm/patch/20230522165811.123417-1-jaz@… Changelog v3..v4 Address Alex Williamson feedback: - Instead of introducing new ioctl used for eventfd registration, take advantage of VFIO_DEVICE_SET_IRQS which already supports virtual IRQs for things like error notification and device release requests. - Introduced mechanism preventing creation of large queues. Other: - Move the implementation into the newly introduced VFIO_ACPI_NOTIFY helper module. It is actually not bound to VFIO_PCI but VFIO_PCI enables it whenever ACPI support is enabled. This change is introduced since ACPI notifications are not limited to PCI devices, making it PCI independent will allow to re-use it also for other VFIO_* like supports: e.g. VFIO_PLATFORM in the future if needed. Moving it out of drivers/vfio/pci/ was also suggested offline. - s/notify_val_next/node - v3: https://patchwork.kernel.org/project/kvm/patch/20230502132700.654528-1-jasz… Changelog v2..v3: - Fix compilation warnings when building with "W=1" Changelog v1..v2: - The v2 implementation is actually completely different then v1: instead of using acpi netlink events for propagating ACPI notifications to the user space take advantage of eventfd, which can provide better VMM and device isolation: it allows to use a dedicated channel associated with the device for such events, such that the VMM has direct access. - Using eventfd counter as notification value placeholder was suggested in v1 and requires additional serialization logic introduced in v2. - Since the vfio-pci supports non-ACPI platforms address !CONFIG_ACPI case. - v1 discussion: https://patchwork.kernel.org/project/kvm/patch/20230307220553.631069-1-jaz@… --- drivers/vfio/Kconfig | 5 + drivers/vfio/Makefile | 1 + drivers/vfio/acpi_notify.c | 324 ++++++++++++++++++++++++++++++ drivers/vfio/pci/Kconfig | 1 + drivers/vfio/pci/vfio_pci_core.c | 13 ++ drivers/vfio/pci/vfio_pci_intrs.c | 80 ++++++++ include/linux/vfio_acpi_notify.h | 36 ++++ include/linux/vfio_pci_core.h | 1 + include/uapi/linux/vfio.h | 1 + 9 files changed, 462 insertions(+) create mode 100644 drivers/vfio/acpi_notify.c create mode 100644 include/linux/vfio_acpi_notify.h diff --git a/drivers/vfio/Kconfig b/drivers/vfio/Kconfig index 89e06c981e43..cd9df43a4eb4 100644 --- a/drivers/vfio/Kconfig +++ b/drivers/vfio/Kconfig @@ -12,6 +12,11 @@ menuconfig VFIO If you don't know what to do here, say N. if VFIO +config VFIO_ACPI_NOTIFY + bool + depends on ACPI + default n + config VFIO_CONTAINER bool "Support for the VFIO container /dev/vfio/vfio" select VFIO_IOMMU_TYPE1 if MMU && (X86 || S390 || ARM || ARM64) diff --git a/drivers/vfio/Makefile b/drivers/vfio/Makefile index 70e7dcb302ef..003c2b041785 100644 --- a/drivers/vfio/Makefile +++ b/drivers/vfio/Makefile @@ -7,6 +7,7 @@ vfio-y += vfio_main.o \ vfio-$(CONFIG_IOMMUFD) += iommufd.o vfio-$(CONFIG_VFIO_CONTAINER) += container.o vfio-$(CONFIG_VFIO_VIRQFD) += virqfd.o +vfio-$(CONFIG_VFIO_ACPI_NOTIFY) += acpi_notify.o obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o diff --git a/drivers/vfio/acpi_notify.c b/drivers/vfio/acpi_notify.c new file mode 100644 index 000000000000..b78c33077dfa --- /dev/null +++ b/drivers/vfio/acpi_notify.c @@ -0,0 +1,324 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * VFIO ACPI notification propagation + * + * Author: Grzegorz Jaszczyk <jaz(a)semihalf.com> + */ +#include <linux/file.h> +#include <linux/semaphore.h> +#include <linux/vfio_acpi_notify.h> + +#define NOTIFICATION_QUEUE_SIZE 20 + +struct acpi_eventfd_ctx { + struct eventfd_ctx *acpi_notify_trigger; + struct file *acpi_notify_trigger_file; + struct semaphore notification_sem; + struct work_struct acpi_notification_work; + wait_queue_entry_t wait; + poll_table pt; + struct vfio_acpi_notification *acpi_notify; +}; + +struct vfio_acpi_notification { + struct acpi_eventfd_ctx *acpi_eventfd; + struct list_head notification_list; + struct mutex notification_list_lock; + int notification_queue_count; +}; + +struct notification_queue { + int notification_val; + struct list_head node; +}; + +static int vfio_eventfd_wakeup(wait_queue_entry_t *wait, unsigned int mode, + int sync, void *key) +{ + struct acpi_eventfd_ctx *acpi_eventfdctx = + container_of(wait, struct acpi_eventfd_ctx, wait); + __poll_t flags = key_to_poll(key); + + /* + * eventfd_read signalize EPOLLOUT at the end of its function - this + * means previous eventfd with its notification value was consumed so + * the next notification can be signalized now if pending - schedule + * proper work. + */ + if (flags & EPOLLOUT) { + up(&acpi_eventfdctx->notification_sem); + + schedule_work(&acpi_eventfdctx->acpi_notification_work); + } + + /* + * Even if the eventfd is closed lets still queue notifications so they + * can be replicated when new eventfd is registered (see "Allow eventfd + * to be swapped"). + * + * Below will be reached only in case user closes eventfd and then + * trigger eventfd swap (or vice-versa). + */ + if (flags & EPOLLHUP) { + /* + * eventfd_release after signalling EPOLLHUP calls eventfd_ctx_put + * so no need to do it here. + */ + + kfree(acpi_eventfdctx); + } + + return 0; +} + +static void vfio_ptable_queue_proc(struct file *file, + wait_queue_head_t *wqh, poll_table *pt) +{ + struct acpi_eventfd_ctx *acpi_eventfdctx = + container_of(pt, struct acpi_eventfd_ctx, pt); + + add_wait_queue(wqh, &acpi_eventfdctx->wait); +} + +static struct notification_queue * +acpi_notification_dequeue(struct vfio_acpi_notification *acpi_notify) +{ + struct notification_queue *oldest_entry; + + lockdep_assert_held(&acpi_notify->notification_list_lock); + + oldest_entry = list_first_entry(&acpi_notify->notification_list, + struct notification_queue, + node); + list_del(&oldest_entry->node); + acpi_notify->notification_queue_count--; + + return oldest_entry; +} + +static void acpi_notification_work_fn(struct work_struct *work) +{ + struct acpi_eventfd_ctx *acpi_eventfdctx; + struct vfio_acpi_notification *acpi_notify; + struct notification_queue *entry; + + acpi_eventfdctx = container_of(work, struct acpi_eventfd_ctx, + acpi_notification_work); + + acpi_notify = acpi_eventfdctx->acpi_notify; + + mutex_lock(&acpi_notify->notification_list_lock); + if (list_empty(&acpi_notify->notification_list)) + goto out; + + /* + * If the previous eventfd was not yet consumed by user-space lets hold + * on and exit. The notification function will be rescheduled when + * signaling eventfd will be possible (when the EPOLLOUT will be + * signalized and unlocks notify_events or when eventfd will be swapped). + */ + if (down_trylock(&acpi_eventfdctx->notification_sem)) + goto out; + + entry = acpi_notification_dequeue(acpi_notify); + + mutex_unlock(&acpi_notify->notification_list_lock); + + eventfd_signal(acpi_eventfdctx->acpi_notify_trigger, entry->notification_val); + + kfree(entry); + + return; +out: + mutex_unlock(&acpi_notify->notification_list_lock); +} + +static void +vfio_acpi_notify_cleanup(struct vfio_acpi_notification **acpi_notify_ptr, + struct acpi_device *adev) +{ + struct vfio_acpi_notification *acpi_notify = *acpi_notify_ptr; + struct acpi_eventfd_ctx *acpi_eventfd = acpi_notify->acpi_eventfd; + struct notification_queue *entry, *entry_tmp; + u64 cnt; + + eventfd_ctx_remove_wait_queue(acpi_eventfd->acpi_notify_trigger, + &acpi_eventfd->wait, &cnt); + + flush_work(&acpi_eventfd->acpi_notification_work); + + mutex_lock(&acpi_notify->notification_list_lock); + list_for_each_entry_safe(entry, entry_tmp, + &acpi_notify->notification_list, + node) { + list_del(&entry->node); + kfree(entry); + } + mutex_unlock(&acpi_notify->notification_list_lock); + + eventfd_ctx_put(acpi_eventfd->acpi_notify_trigger); + + /* + * fput releases references to eventfd file but it will not trigger the + * vfio_eventfd_wakeup with EPOLLHUP since eventfd_ctx_remove_wait_queue + * was already called and removed wq entry (wait) from the eventfd + * wq head. + */ + fput(acpi_eventfd->acpi_notify_trigger_file); + + kfree(acpi_notify->acpi_eventfd); + kfree(acpi_notify); + + *acpi_notify_ptr = NULL; +} + +static void vfio_acpi_notify_handler(acpi_handle handle, u32 event, void *data) +{ + struct vfio_acpi_notification *acpi_notify = (struct vfio_acpi_notification *)data; + struct notification_queue *entry; + + entry = kmalloc(sizeof(*entry), GFP_KERNEL); + if (!entry) + return; + + entry->notification_val = event; + INIT_LIST_HEAD(&entry->node); + + mutex_lock(&acpi_notify->notification_list_lock); + if (acpi_notify->notification_queue_count > NOTIFICATION_QUEUE_SIZE) { + struct notification_queue *oldest_entry = + acpi_notification_dequeue(acpi_notify); + + if (printk_ratelimit()) + acpi_handle_warn(handle, + "dropping notification value %d\n", + oldest_entry->notification_val); + + kfree(oldest_entry); + } + list_add_tail(&entry->node, &acpi_notify->notification_list); + acpi_notify->notification_queue_count++; + mutex_unlock(&acpi_notify->notification_list_lock); + + schedule_work(&acpi_notify->acpi_eventfd->acpi_notification_work); +} + +void vfio_acpi_notify(struct acpi_device *adev, u32 event, void *data) +{ + acpi_handle handle = adev->handle; + + vfio_acpi_notify_handler(handle, event, data); +} +EXPORT_SYMBOL_GPL(vfio_acpi_notify); + +void vfio_remove_acpi_notify(struct vfio_acpi_notification **acpi_notify_ptr, + struct acpi_device *adev) +{ + struct vfio_acpi_notification *acpi_notify = *acpi_notify_ptr; + + if (!acpi_notify) + return; + + acpi_remove_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, + vfio_acpi_notify_handler); + + vfio_acpi_notify_cleanup(acpi_notify_ptr, adev); +} +EXPORT_SYMBOL_GPL(vfio_remove_acpi_notify); + +static void vfio_acpi_eventfd_init(struct vfio_acpi_notification *acpi_notify, + struct eventfd_ctx *efdctx, int32_t fd) +{ + struct acpi_eventfd_ctx *acpi_eventfd; + + acpi_eventfd = kzalloc(sizeof(struct acpi_eventfd_ctx), GFP_KERNEL_ACCOUNT); + + INIT_WORK(&acpi_eventfd->acpi_notification_work, acpi_notification_work_fn); + acpi_eventfd->acpi_notify_trigger = efdctx; + + sema_init(&acpi_eventfd->notification_sem, 1); + + /* + * Install custom wake-up handler to be notified whenever underlying + * eventfd is consumed by the user-space. + */ + init_waitqueue_func_entry(&acpi_eventfd->wait, vfio_eventfd_wakeup); + init_poll_funcptr(&acpi_eventfd->pt, vfio_ptable_queue_proc); + + acpi_eventfd->acpi_notify_trigger_file = eventfd_fget(fd); + vfs_poll(acpi_eventfd->acpi_notify_trigger_file, &acpi_eventfd->pt); + + acpi_eventfd->acpi_notify = acpi_notify; + acpi_notify->acpi_eventfd = acpi_eventfd; +} + +int vfio_register_acpi_notify_handler(struct vfio_acpi_notification **acpi_notify_ptr, + struct acpi_device *adev, int32_t fd) +{ + struct vfio_acpi_notification *acpi_notify = *acpi_notify_ptr; + struct eventfd_ctx *efdctx; + acpi_status status; + + if (fd < -1) + return -EINVAL; + else if (fd == -1) { + vfio_remove_acpi_notify(acpi_notify_ptr, adev); + return 0; + } + + efdctx = eventfd_ctx_fdget(fd); + if (IS_ERR(efdctx)) + return PTR_ERR(efdctx); + + /* Allow eventfd to be swapped */ + if (acpi_notify) { + struct file *trigger_file_before_swap = + acpi_notify->acpi_eventfd->acpi_notify_trigger_file; + + /* + * Lets allocate new acpi_eventfd_ctx, the previous is + * alive until eventfd is closed. + */ + vfio_acpi_eventfd_init(acpi_notify, efdctx, fd); + + /* + * The ACPI notifications could arrive and be queued during + * eventfd swap, retrigger the worker after notification + * replication unlocking. + */ + schedule_work(&acpi_notify->acpi_eventfd->acpi_notification_work); + + /* + * If the last reference to acpi_notify_trigger_file was + * released, the EPOLLHUP will be handled (but not immediately + * since fput is async). + */ + fput(trigger_file_before_swap); + + return 0; + } + + acpi_notify = kzalloc(sizeof(*acpi_notify), GFP_KERNEL_ACCOUNT); + if (!acpi_notify) + return -ENOMEM; + + *acpi_notify_ptr = acpi_notify; + mutex_init(&acpi_notify->notification_list_lock); + INIT_LIST_HEAD(&acpi_notify->notification_list); + + vfio_acpi_eventfd_init(acpi_notify, efdctx, fd); + + status = acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, + vfio_acpi_notify_handler, (void *)acpi_notify); + if (ACPI_FAILURE(status)) { + dev_err(&adev->dev, "Failed to install notify handler: %s", + acpi_format_exception(status)); + + vfio_acpi_notify_cleanup(acpi_notify_ptr, adev); + + return -ENODEV; + } + + return 0; +} +EXPORT_SYMBOL_GPL(vfio_register_acpi_notify_handler); diff --git a/drivers/vfio/pci/Kconfig b/drivers/vfio/pci/Kconfig index f9d0c908e738..f03ca773dfd9 100644 --- a/drivers/vfio/pci/Kconfig +++ b/drivers/vfio/pci/Kconfig @@ -4,6 +4,7 @@ config VFIO_PCI_CORE tristate select VFIO_VIRQFD select IRQ_BYPASS_MANAGER + select VFIO_ACPI_NOTIFY if ACPI config VFIO_PCI_MMAP def_bool y if !S390 diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c index a5ab416cf476..1cc4a9c05403 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -27,6 +27,7 @@ #include <linux/vgaarb.h> #include <linux/nospec.h> #include <linux/sched/mm.h> +#include <linux/vfio_acpi_notify.h> #if IS_ENABLED(CONFIG_EEH) #include <asm/eeh.h> #endif @@ -683,6 +684,7 @@ void vfio_pci_core_close_device(struct vfio_device *core_vdev) { struct vfio_pci_core_device *vdev = container_of(core_vdev, struct vfio_pci_core_device, vdev); + struct acpi_device *adev = ACPI_COMPANION(&vdev->pdev->dev); if (vdev->sriov_pf_core_dev) { mutex_lock(&vdev->sriov_pf_core_dev->vf_token->lock); @@ -704,6 +706,8 @@ void vfio_pci_core_close_device(struct vfio_device *core_vdev) eventfd_ctx_put(vdev->req_trigger); vdev->req_trigger = NULL; } + if (adev) + vfio_remove_acpi_notify(&vdev->acpi_notification, adev); mutex_unlock(&vdev->igate); } EXPORT_SYMBOL_GPL(vfio_pci_core_close_device); @@ -725,6 +729,8 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_finish_enable); static int vfio_pci_get_irq_count(struct vfio_pci_core_device *vdev, int irq_type) { + struct acpi_device *adev = ACPI_COMPANION(&vdev->pdev->dev); + if (irq_type == VFIO_PCI_INTX_IRQ_INDEX) { u8 pin; @@ -761,6 +767,8 @@ static int vfio_pci_get_irq_count(struct vfio_pci_core_device *vdev, int irq_typ return 1; } else if (irq_type == VFIO_PCI_REQ_IRQ_INDEX) { return 1; + } else if (adev && irq_type == VFIO_PCI_ACPI_IRQ_INDEX) { + return 1; } return 0; @@ -1084,6 +1092,7 @@ static int vfio_pci_ioctl_get_irq_info(struct vfio_pci_core_device *vdev, struct vfio_irq_info __user *arg) { unsigned long minsz = offsetofend(struct vfio_irq_info, count); + struct acpi_device *adev = ACPI_COMPANION(&vdev->pdev->dev); struct vfio_irq_info info; if (copy_from_user(&info, arg, minsz)) @@ -1096,6 +1105,10 @@ static int vfio_pci_ioctl_get_irq_info(struct vfio_pci_core_device *vdev, case VFIO_PCI_INTX_IRQ_INDEX ... VFIO_PCI_MSIX_IRQ_INDEX: case VFIO_PCI_REQ_IRQ_INDEX: break; + case VFIO_PCI_ACPI_IRQ_INDEX: + if (adev) + break; + return -EINVAL; case VFIO_PCI_ERR_IRQ_INDEX: if (pci_is_pcie(vdev->pdev)) break; diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c index bffb0741518b..27d0c4cdc3c9 100644 --- a/drivers/vfio/pci/vfio_pci_intrs.c +++ b/drivers/vfio/pci/vfio_pci_intrs.c @@ -19,6 +19,7 @@ #include <linux/vfio.h> #include <linux/wait.h> #include <linux/slab.h> +#include <linux/vfio_acpi_notify.h> #include "vfio_pci_priv.h" @@ -667,6 +668,71 @@ static int vfio_pci_set_req_trigger(struct vfio_pci_core_device *vdev, count, flags, data); } +static int +vfio_pci_set_acpi_ntfy_trigger(struct vfio_pci_core_device *vdev, + unsigned int index, unsigned int start, + unsigned int count, uint32_t flags, void *data) +{ + struct acpi_device *adev = ACPI_COMPANION(&vdev->pdev->dev); + + if (index != VFIO_PCI_ACPI_IRQ_INDEX || start != 0 || count > 1) + return -EINVAL; + + if (!adev) + return -ENODEV; + + if (!vdev->acpi_notification) + return -EINVAL; + + /* + * Disable notifications: flags = (DATA_NONE|ACTION_TRIGGER), count = 0 + * Enable loopback testing: (DATA_BOOL|ACTION_TRIGGER) or + * (DATA_NONE|ACTION_TRIGGER), count != 0 + */ + if (flags & VFIO_IRQ_SET_DATA_NONE) { + if (count) + vfio_acpi_notify(adev, ACPI_NOTIFY_DEVICE_CHECK, + vdev->acpi_notification); + else + vfio_remove_acpi_notify(&vdev->acpi_notification, adev); + + return 0; + } else if (flags & VFIO_IRQ_SET_DATA_BOOL) { + uint8_t trigger; + + if (!count) + return -EINVAL; + + trigger = *(uint8_t *)data; + if (trigger) + vfio_acpi_notify(adev, ACPI_NOTIFY_DEVICE_CHECK, + vdev->acpi_notification); + + return 0; + } + + return -EINVAL; +} + +static int +vfio_pci_set_acpi_ntfy_eventfd_trigger(struct vfio_pci_core_device *vdev, + unsigned int index, unsigned int start, + unsigned int count, uint32_t flags, void *data) +{ + struct acpi_device *adev = ACPI_COMPANION(&vdev->pdev->dev); + int32_t fd; + + if (index != VFIO_PCI_ACPI_IRQ_INDEX || start != 0 || count != 1) + return -EINVAL; + + if (!adev) + return -ENODEV; + + fd = *(int32_t *)data; + + return vfio_register_acpi_notify_handler(&vdev->acpi_notification, adev, fd); +} + int vfio_pci_set_irqs_ioctl(struct vfio_pci_core_device *vdev, uint32_t flags, unsigned index, unsigned start, unsigned count, void *data) @@ -716,6 +782,20 @@ int vfio_pci_set_irqs_ioctl(struct vfio_pci_core_device *vdev, uint32_t flags, break; } break; + case VFIO_PCI_ACPI_IRQ_INDEX: + switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) { + case VFIO_IRQ_SET_ACTION_TRIGGER: + switch (flags & VFIO_IRQ_SET_DATA_TYPE_MASK) { + case VFIO_IRQ_SET_DATA_BOOL: + case VFIO_IRQ_SET_DATA_NONE: + func = vfio_pci_set_acpi_ntfy_trigger; + break; + case VFIO_IRQ_SET_DATA_EVENTFD: + func = vfio_pci_set_acpi_ntfy_eventfd_trigger; + break; + } + } + break; } if (!func) diff --git a/include/linux/vfio_acpi_notify.h b/include/linux/vfio_acpi_notify.h new file mode 100644 index 000000000000..e29e4274d192 --- /dev/null +++ b/include/linux/vfio_acpi_notify.h @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * VFIO ACPI notification replication + * + * Author: Grzegorz Jaszczyk <jaz(a)semihalf.com> + */ +#include <linux/acpi.h> +#include <linux/eventfd.h> +#include <linux/poll.h> + +#ifndef VFIO_ACPI_NOTIFY_H +#define VFIO_ACPI_NOTIFY_H + +struct vfio_acpi_notification; + +#if IS_ENABLED(CONFIG_ACPI) +void vfio_acpi_notify(struct acpi_device *adev, u32 event, void *data); +int vfio_register_acpi_notify_handler(struct vfio_acpi_notification **acpi_notify, + struct acpi_device *adev, int32_t fd); +void vfio_remove_acpi_notify(struct vfio_acpi_notification **acpi_notify, + struct acpi_device *adev); +#else +static inline void vfio_acpi_notify(struct acpi_device *adev, u32 event, void *data) {} +static inline int +vfio_register_acpi_notify_handler(struct vfio_acpi_notification **acpi_notify, + struct acpi_device *adev, int32_t fd) +{ + return -ENODEV; +} + +static inline void +vfio_remove_acpi_notify(struct vfio_acpi_notification **acpi_notify, + struct acpi_device *adev) {} +#endif /* CONFIG_ACPI */ + +#endif /* VFIO_ACPI_NOTIFY_H */ diff --git a/include/linux/vfio_pci_core.h b/include/linux/vfio_pci_core.h index 367fd79226a3..a4491b3d8064 100644 --- a/include/linux/vfio_pci_core.h +++ b/include/linux/vfio_pci_core.h @@ -96,6 +96,7 @@ struct vfio_pci_core_device { struct mutex vma_lock; struct list_head vma_list; struct rw_semaphore memory_lock; + struct vfio_acpi_notification *acpi_notification; }; /* Will be exported for vfio pci drivers usage */ diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index b71276bd7f91..ee8ba6354662 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -625,6 +625,7 @@ enum { VFIO_PCI_MSIX_IRQ_INDEX, VFIO_PCI_ERR_IRQ_INDEX, VFIO_PCI_REQ_IRQ_INDEX, + VFIO_PCI_ACPI_IRQ_INDEX, VFIO_PCI_NUM_IRQS }; -- 2.41.0.255.g8b1d071c50-goog

1 0

[PATCH 0/2] qemu: VM saving related fixes
by Peter Krempa 30 Jun '23

30 Jun '23

Peter Krempa (2): qemu: driver: Reformat helpers for saving VM state Properly mark auto-added 'terminator' virStorageSource src/qemu/qemu_domain.c | 4 +++- src/qemu/qemu_driver.c | 11 +++++++---- src/storage_file/storage_source.c | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) -- 2.41.0

2 4

[PATCH 0/2] NEWS update for upcoming release
by Peter Krempa 30 Jun '23

30 Jun '23

Peter Krempa (2): NEWS: Move section about 'discard_no_unref' to features NEWS: Document changes for the release NEWS.rst | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) -- 2.41.0

2 4

Entering freeze for libvirt-9.5.0
by Jiri Denemark 30 Jun '23

30 Jun '23

I have just tagged v9.5.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://download.libvirt.org/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 1

[PATCH] apparmor: Add support for local profile customizations
by Jim Fehlig 29 Jun '23

29 Jun '23

Apparmor profiles in /etc/apparmor.d/ are config files that can and should be replaced on package upgrade, which introduces the potential to overwrite any local changes. Apparmor supports local profile customizations via /etc/apparmor.d/local/<service> [1]. This change makes the support explicit by adding libvirtd, virtqemud, and virtxend profile customization stubs to /etc/apparmor.d/local/. The stubs are conditionally included by the corresponding main profiles. [1] https://ubuntu.com/server/docs/security-apparmor See "Profile customization" section Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- This patch was inspired by an internal bug report. The SUSE libvirt package has marked /etc/apparmor.d/<some-libvirt-service> profiles as 'config(noreplace)' for as long as I can remember. On rare occasions a profile receives a change that is required to avoid regression. And on rarer occasions a user might have made local customizations to the profile. With 'noreplace', the trap is set for the user to experience the regression. Unless other apparmor users convince me otherwise, I'm planning to make this change in the SUSE package, along with changing the main /etc/apparmor.d/ profiles to 'config' and using 'config(noreplace)' for the local customizations only. Note: I'm fine keeping this as a downstream-only patch if upstream isn't interested in the clutter. src/security/apparmor/meson.build | 12 +++++++----- src/security/apparmor/usr.sbin.libvirtd.in | 3 +++ src/security/apparmor/usr.sbin.libvirtd.local | 1 + src/security/apparmor/usr.sbin.virtqemud.in | 3 +++ src/security/apparmor/usr.sbin.virtqemud.local | 1 + src/security/apparmor/usr.sbin.virtxend.in | 3 +++ src/security/apparmor/usr.sbin.virtxend.local | 1 + 7 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build index 58b4024b85..02a6d098ad 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build @@ -34,8 +34,10 @@ install_data( install_dir: apparmor_dir / 'libvirt', ) -install_data( - 'usr.lib.libvirt.virt-aa-helper.local', - install_dir: apparmor_dir / 'local', - rename: 'usr.lib.libvirt.virt-aa-helper', -) +foreach name : apparmor_gen_profiles + install_data( + '@0@.local'.format(name), + install_dir: apparmor_dir / 'local', + rename: name, + ) +endforeach diff --git a/src/security/apparmor/usr.sbin.libvirtd.in b/src/security/apparmor/usr.sbin.libvirtd.in index edb8dd8e26..41bdef53ec 100644 --- a/src/security/apparmor/usr.sbin.libvirtd.in +++ b/src/security/apparmor/usr.sbin.libvirtd.in @@ -139,4 +139,7 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) { /usr/{lib,lib64,lib/qemu,libexec}/qemu-bridge-helper rmix, } + + # Site-specific additions and overrides. See local/README for details. + include if exists <local/usr.sbin.libvirtd> } diff --git a/src/security/apparmor/usr.sbin.libvirtd.local b/src/security/apparmor/usr.sbin.libvirtd.local new file mode 100644 index 0000000000..3716400022 --- /dev/null +++ b/src/security/apparmor/usr.sbin.libvirtd.local @@ -0,0 +1 @@ +# Site-specific additions and overrides for 'usr.sbin.libvirtd' diff --git a/src/security/apparmor/usr.sbin.virtqemud.in b/src/security/apparmor/usr.sbin.virtqemud.in index f269c60809..3ebdbf2a8f 100644 --- a/src/security/apparmor/usr.sbin.virtqemud.in +++ b/src/security/apparmor/usr.sbin.virtqemud.in @@ -132,4 +132,7 @@ profile virtqemud @sbindir@/virtqemud flags=(attach_disconnected) { /usr/{lib,lib64,lib/qemu,libexec}/qemu-bridge-helper rmix, } + + # Site-specific additions and overrides. See local/README for details. + include if exists <local/usr.sbin.virtqemud> } diff --git a/src/security/apparmor/usr.sbin.virtqemud.local b/src/security/apparmor/usr.sbin.virtqemud.local new file mode 100644 index 0000000000..2ac68bb069 --- /dev/null +++ b/src/security/apparmor/usr.sbin.virtqemud.local @@ -0,0 +1 @@ +# Site-specific additions and overrides for 'usr.sbin.virtqemud' diff --git a/src/security/apparmor/usr.sbin.virtxend.in b/src/security/apparmor/usr.sbin.virtxend.in index 72e0d801e5..719766a0c1 100644 --- a/src/security/apparmor/usr.sbin.virtxend.in +++ b/src/security/apparmor/usr.sbin.virtxend.in @@ -52,4 +52,7 @@ profile virtxend @sbindir@/virtxend flags=(attach_disconnected) { @libexecdir@/libvirt_iohelper ix, /etc/libvirt/hooks/** rmix, /etc/xen/scripts/** rmix, + + # Site-specific additions and overrides. See local/README for details. + include if exists <local/usr.sbin.virtxend> } diff --git a/src/security/apparmor/usr.sbin.virtxend.local b/src/security/apparmor/usr.sbin.virtxend.local new file mode 100644 index 0000000000..2ade86d4df --- /dev/null +++ b/src/security/apparmor/usr.sbin.virtxend.local @@ -0,0 +1 @@ +# Site-specific additions and overrides for 'usr.sbin.virtxend' -- 2.40.1

5 22

[libvirt PATCH 0/8] apparmor: Improve overrides, fix 2.x compatibility
by Andrea Bolognani 29 Jun '23

29 Jun '23

An alternative to Jim's attempt[1]. See [2] for the discussion leading up to these changes. [1] https://listman.redhat.com/archives/libvir-list/2023-June/240531.html [2] https://listman.redhat.com/archives/libvir-list/2023-June/240251.html Andrea Bolognani (8): meson: Detect AppArmor 3.x apparmor: Allow version-specific bits in profiles apparmor: Allow version-specific bits in abstractions too apparmor: Only support passt on 3.x apparmor: Make abstractions extensible apparmor: Improve virt-aa-helper include apparmor: Make all profiles extensible NEWS: Mention overrides for AppArmor profiles and abstractions NEWS.rst | 8 +++ meson.build | 3 + .../apparmor/{libvirt-lxc => libvirt-lxc.in} | 4 ++ .../{libvirt-qemu => libvirt-qemu.in} | 6 ++ src/security/apparmor/meson.build | 68 ++++++++++++++++--- .../usr.lib.libvirt.virt-aa-helper.in | 5 ++ src/security/apparmor/usr.sbin.libvirtd.in | 4 ++ src/security/apparmor/usr.sbin.virtqemud.in | 4 ++ src/security/apparmor/usr.sbin.virtxend.in | 4 ++ 9 files changed, 96 insertions(+), 10 deletions(-) rename src/security/apparmor/{libvirt-lxc => libvirt-lxc.in} (98%) rename src/security/apparmor/{libvirt-qemu => libvirt-qemu.in} (98%) -- 2.41.0

2 10

[PATCH V2 0/3] apparmor: Add support for local profile customizations
by Jim Fehlig 29 Jun '23

29 Jun '23

This is a stab at a V2 of https://listman.redhat.com/archives/libvir-list/2023-June/240219.html That patch was ACKed and committed, but reverted before the 9.5.0 release since it could be problematic with older apparmor 2.x versions still supported by libvirt. Andrea suggested copies of the profiles for apparmor 2.x and 3.x. This series takes that approach, with patch 1 making an identical copy of the src/security/apparmor directory. Patches 2 and 3 then adjust the profiles accordingly. My approach to copying the existing directory does introduce some duplicate files in the tree, but otherwise it's minimally disruptive and will be easy to rip out when upstream libvirt no longer needs to support apparmor 2.x. FYI, so far I've only tested with apparmor 3.x, but I did push the changes to my fork with CI enabled https://gitlab.com/jfehlig/libvirt/-/pipelines/915347878 Thanks for comments/suggestions! Jim Fehlig (3): apparmor: Create version specific apparmor profiles apparmor: Remove support for passt from apparmor 2.x apparmor: Add support for local profile customizations meson.build | 6 +- src/security/apparmor-2/TEMPLATE.lxc | 15 + src/security/apparmor-2/TEMPLATE.qemu | 9 + src/security/apparmor-2/libvirt-lxc | 118 ++++++++ src/security/apparmor-2/libvirt-qemu | 256 ++++++++++++++++++ src/security/apparmor-2/meson.build | 41 +++ .../usr.lib.libvirt.virt-aa-helper.in | 75 +++++ .../usr.lib.libvirt.virt-aa-helper.local | 1 + src/security/apparmor-2/usr.sbin.libvirtd.in | 142 ++++++++++ src/security/apparmor-2/usr.sbin.virtqemud.in | 135 +++++++++ src/security/apparmor-2/usr.sbin.virtxend.in | 55 ++++ src/security/apparmor/libvirt-lxc | 3 + src/security/apparmor/libvirt-qemu | 3 + src/security/apparmor/usr.sbin.libvirtd.in | 5 +- src/security/apparmor/usr.sbin.virtqemud.in | 3 + src/security/apparmor/usr.sbin.virtxend.in | 3 + src/security/meson.build | 3 + 17 files changed, 871 insertions(+), 2 deletions(-) create mode 100644 src/security/apparmor-2/TEMPLATE.lxc create mode 100644 src/security/apparmor-2/TEMPLATE.qemu create mode 100644 src/security/apparmor-2/libvirt-lxc create mode 100644 src/security/apparmor-2/libvirt-qemu create mode 100644 src/security/apparmor-2/meson.build create mode 100644 src/security/apparmor-2/usr.lib.libvirt.virt-aa-helper.in create mode 100644 src/security/apparmor-2/usr.lib.libvirt.virt-aa-helper.local create mode 100644 src/security/apparmor-2/usr.sbin.libvirtd.in create mode 100644 src/security/apparmor-2/usr.sbin.virtqemud.in create mode 100644 src/security/apparmor-2/usr.sbin.virtxend.in -- 2.41.0

3 6

[PATCH] nodedev: transient mdev update on nodeDeviceCreateXML
by Boris Fiuczynski 29 Jun '23

29 Jun '23

Update the optional mdev attributes on the new created nodedev object as they otherwise would not get set until the next mdevctl update cycle. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2143158 Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- src/node_device/node_device_driver.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index a2d0600560..5134d246f3 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -847,6 +847,9 @@ static virNodeDevicePtr nodeDeviceCreateXMLMdev(virConnectPtr conn, virNodeDeviceDef *def) { + virNodeDeviceObj *obj; + virNodeDeviceDef *new_def; + virNodeDevicePtr device; g_autofree char *uuid = NULL; if (!def->parent) { @@ -864,8 +867,19 @@ nodeDeviceCreateXMLMdev(virConnectPtr conn, def->caps->data.mdev.uuid = g_steal_pointer(&uuid); } - return nodeDeviceFindNewMediatedDevice(conn, def->caps->data.mdev.uuid, - def->caps->data.mdev.parent_addr); + device = nodeDeviceFindNewMediatedDevice(conn, def->caps->data.mdev.uuid, + def->caps->data.mdev.parent_addr); + /* check on def for attributes and try update */ + if (def->caps->data.mdev.nattributes > 0) { + /* ignore failures as mdevctl updates will recover later */ + if (!(obj = nodeDeviceObjFindByName(device->name))) + return device; + new_def = virNodeDeviceObjGetDef(obj); + nodeDeviceDefCopyFromMdevctl(new_def, def); + virNodeDeviceObjEndAPI(&obj); + } + + return device; } -- 2.41.0

2 4