From 365ef813507974661ac0e4c6bf7daa604846bede Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Mon, 30 Mar 2026 10:01:18 -0400
Subject: [PATCH] import CS libvirt-11.10.0-12.el9

---
 .gitignore                                    |     2 +-
 .libvirt.metadata                             |     2 +-
 ...tion-type-into-virDomainGetGuestInfo.patch |    53 -
 ...rams-via-virConnectGetAllDomainStats.patch |   248 +
 ...eration-latency-histogram-collection.patch |   422 +
 ...-migrate-pr-capability-of-scsi-block.patch |   125 +
 ...Bump-minimum-glib2-version-to-2.66.0.patch |   286 -
 ...nf-Adjust-hyperv-tlbflush-formatting.patch |    72 -
 ...ntroduce-iommufd-enum-for-domaincaps.patch |    69 +
 ...virDomainDefHasPCIHostdevWithIOMMUFD.patch |   132 +
 ...uce-virHostdevIsPCIDeviceWithIOMMUFD.patch |    89 +
 ...nf-add-deprecated_features-attribute.patch |   280 -
 ...rough-and-xtsup-attributes-for-IOMMU.patch |   198 -
 ...irDomainHostdevInsert-to-return-void.patch |   158 -
 ...irect-and-extended-tlbflush-features.patch |   213 -
 ...uce-support-for-multiple-ACPI-tables.patch |   422 -
 ...erface-types-with-backend-type-passt.patch |   103 -
 ...t-almost-optional-for-type-vhostuser.patch |   170 -
 ...-refactor-hyperv-features-formatting.patch |   112 -
 ...rt-conf-support-MSDM-ACPI-table-type.patch |   119 -
 ...libvirt-cpu_map-Add-486-v1-CPU-model.patch |   658 -
 ...virt-cpu_map-Add-Conroe-v1-CPU-model.patch |   684 -
 ...-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch |   869 -
 ...u_map-Add-GraniteRapids-v2-CPU-model.patch |   669 -
 ...cpu_map-Add-KnightsMill-v1-CPU-model.patch |  1417 -
 ...-cpu_map-Add-Opteron_G1-v1-CPU-model.patch |   658 -
 ...-cpu_map-Add-Opteron_G2-v1-CPU-model.patch |   658 -
 ...-cpu_map-Add-Opteron_G3-v1-CPU-model.patch |   768 -
 ...-cpu_map-Add-Opteron_G4-v1-CPU-model.patch |  1097 -
 ...-cpu_map-Add-Opteron_G5-v1-CPU-model.patch |  1154 -
 ...virt-cpu_map-Add-Penryn-v1-CPU-model.patch |   684 -
 ...virt-cpu_map-Add-athlon-v1-CPU-model.patch |   879 -
 ...bvirt-cpu_map-Add-avx10-CPU-features.patch |    51 -
 ...rt-cpu_map-Add-core2duo-v1-CPU-model.patch |   827 -
 ...irt-cpu_map-Add-coreduo-v1-CPU-model.patch |   814 -
 ...bvirt-cpu_map-Add-kvm32-v1-CPU-model.patch |   658 -
 ...bvirt-cpu_map-Add-kvm64-v1-CPU-model.patch |   658 -
 ...ibvirt-cpu_map-Add-n270-v1-CPU-model.patch |   840 -
 ...irt-cpu_map-Add-pentium-v1-CPU-model.patch |   658 -
 ...rt-cpu_map-Add-pentium2-v1-CPU-model.patch |   658 -
 ...rt-cpu_map-Add-pentium3-v1-CPU-model.patch |   658 -
 ...virt-cpu_map-Add-phenom-v1-CPU-model.patch |   950 -
 ...virt-cpu_map-Add-qemu32-v1-CPU-model.patch |   658 -
 ...virt-cpu_map-Add-qemu64-v1-CPU-model.patch |   658 -
 ...-Add-sha512-sm3-and-sm4-CPU-features.patch |    46 -
 ...u_map-Sort-data-files-in-meson.build.patch |    73 -
 ...ackend-with-interface-type-vhostuser.patch |   139 -
 ...s-for-disk-driver-statistics-element.patch |    62 +
 ...statistics-element-under-disk-driver.patch |    51 +
 ...document-intel-only-IOMMU-attributes.patch |    61 -
 ...-differences-between-SLIRP-and-passt.patch |   177 -
 ...tialize-network-hostdev-private-data.patch |    94 +
 ...empty-path-URI-component-same-way-as.patch |    49 -
 ...ent-CA-bundle-for-remote-connections.patch |   119 -
 ...x-URI-encode-inventory-objects-twice.patch |    59 +
 ...te-failure-to-lookup-a-single-domain.patch |    63 -
 ...roduce-esxUtil_EscapeInventoryObject.patch |    76 +
 ...-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch |    69 -
 ...-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch |    47 -
 ...iommufd-fix-FD-leak-in-case-of-error.patch |    38 +
 ...BILITIES_DISABLE_DEPRECATED_FEATURES.patch |    58 -
 ...scription-of-the-CPU-frequency-field.patch |    51 -
 ...libxl-support-rawset-ACPI-table-type.patch |    85 -
 ...-Add-existing-flags-to-virCheckFlags.patch |    37 -
 ...om-virNodeGetInfo-for-virsh-nodeinfo.patch |    55 -
 ...ree-inhibitor-in-networkStateCleanup.patch |    44 -
 ...pport-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch |    72 -
 ...irect-and-extended-tlbflush-features.patch |   108 -
 ...libvirt-qemu-Allow-virtio-mem-on-CCW.patch |    36 -
 ...DomainCheckCPU-with-unknown-host-CPU.patch |    38 -
 ...-Convert-IOMMUFD-to-qemuFDPassDirect.patch |   125 +
 ...ert-vfioDeviceFd-to-qemuFDPassDirect.patch |   129 +
 ...mu-Do-NOT-autoadd-NUMA-node-for-s390.patch |    50 -
 ...Enable-I-O-APIC-even-more-frequently.patch |   154 -
 ...bvirt-qemu-Enable-I-O-APIC-if-needed.patch |    61 -
 ...-done-via-QMP-into-a-separate-helper.patch |   144 +
 ...-qemu-Fill-iommufd-domain-capability.patch |  1257 +
 ...BLOCK_IO_ERROR-event-in-monitor-code.patch |    66 -
 ...virt-qemu-Ignore-cmp_legacy-CPU-flag.patch |   713 +
 ...t-for-associating-iommufd-to-hostdev.patch |   190 +
 ...istent-reservation-migration-control.patch |   220 +
 ...u-Introduce-QEMU_CAPS_OBJECT_IOMMUFD.patch |   266 +
 ...u-Introduce-privateData-for-hostdevs.patch |   276 +
 ...-IOMMUFD-validation-to-qemu_validate.patch |   111 +
 ...-migration-state-to-TPM-cleanup-code.patch |   135 -
 ...vice-in-qemu-IO-error-event-handling.patch |    93 -
 ...n-parameter-in-various-TPM-functions.patch |   230 -
 ...u-Save-IOMMUFD-state-into-status-XML.patch |    79 +
 ...histograms-on-startup-hotplug-update.patch |   132 +
 ...rocess-memory-accounting-for-iommufd.patch |   211 +
 ...p-namespace-and-seclabel-for-iommufd.patch |   335 +
 ...libvirt-qemu-Validate-virtio-mem-ccw.patch |    86 -
 .../libvirt-qemu-add-IOMMU-model-amd.patch    |   337 -
 ...to-set-TLS-priority-string-with-QEMU.patch |   690 -
 ...n-of-guest-with-mdev-vGPU-to-VF-vGPU.patch |    76 -
 ...-virtio-for-interface-type-vhostuser.patch |    41 -
 ...roduce-QEMU_CAPS_BLOCKDEV_SET_ACTIVE.patch |    76 -
 ...MU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR.patch |    58 +
 ...-scsi-block-and-scsi-generic-devices.patch |  7714 +++
 ...emu-complete-vhostuser-passt-support.patch |   663 -
 ...-attribute-validation-in-qemu-driver.patch |    75 -
 ...r-a-virStorageSource-before-using-it.patch |    85 -
 ...as-vhostuser-passt-but-no-shared-mem.patch |   203 -
 ...-fix-order-of-VNC-TLS-config-entries.patch |    84 -
 ...-guest-side-IP-address-for-type-vdpa.patch |    94 -
 ...t-qemu-introduce-QEMU_CAPS_AMD_IOMMU.patch |   253 -
 ...virt-qemu-introduce-QEMU_CAPS_PCI_ID.patch |  4646 --
 ...ect-behave-identically-to-passt-user.patch |   111 -
 ...tDevStreamDisconnectedEvent-reusable.patch |   119 -
 ...ake-qemuPasstCreateSocketPath-public.patch |    51 -
 ...block-dirty-bitmaps-during-migration.patch |   147 +
 ...after-migration-if-VM-is-left-paused.patch |   139 -
 ...lers-for-block-latency-histogram-set.patch |   182 +
 ...itor-backend-for-blockdev-set-active.patch |   160 -
 ...maps-from-qcow2-format-specific-data.patch |   173 +
 ...-histogram-stats-into-qemuBlockStats.patch |   168 +
 ...u-open-VFIO-FDs-from-libvirt-backend.patch |   246 +
 ...open-iommufd-FD-from-libvirt-backend.patch |   174 +
 ...m-query-cpu-model-expansion-response.patch |   243 -
 ...repareNVRAM-for-use-in-snapshot-code.patch |   109 -
 ...un-updated-qemuProcessStartWarnShmem.patch |    94 -
 ...kThrottling-to-qemuProcessSetupDisks.patch |    62 +
 ...ecial-for-passt-in-a-helper-function.patch |   110 -
 ...interface-types-during-update-device.patch |   106 -
 ...processNetdevStreamDisconnectedEvent.patch |    56 -
 ...NETDEV_VHOST_USER_DISCONNECTED-event.patch |   224 -
 ...-sanitize-blank-lines-in-config-file.patch |   326 -
 ...en-taking-inactive-internal-snapshot.patch |    94 -
 ...-only-if-parent-snapshot-is-external.patch |    71 -
 ...g-snapshot-for-VM-with-non-file-disk.patch |    75 -
 ...rt-qemu-support-MSDM-ACPI-table-type.patch |   108 -
 ...irt-qemu-support-raw-ACPI-table-type.patch |   218 -
 ...ion-without-actually-sharing-storage.patch |   119 +
 ...e-profile-name-for-transient-domains.patch |    73 -
 ...f-in-qemuProcessPrepareDomainNetwork.patch |   132 -
 ...nd-vdpa-interfaces-in-the-same-place.patch |    82 -
 ...voke-access-to-file-twice-on-failure.patch |    44 -
 ...etting-of-group_name-out-of-the-loop.patch |    68 +
 ...hottle-group-name-passed-as-argument.patch |    75 +
 ...up-name-into-the-tunable-event-twice.patch |    43 +
 ...rce-non-zero-groupname-string-length.patch |    38 +
 ...maps-Always-consider-offered-bitmaps.patch |    98 +
 ...tmaps-Fix-check-for-existing-bitmaps.patch |    68 +
 ...Expansion-refactor-parsing-functions.patch |   100 -
 ...munge-reason-field-of-IO-error-event.patch |   139 -
 ...IOError-Propagate-new-qom-path-field.patch |   118 -
 ...ile-Fix-NVRAM-image-conversion-check.patch |    67 -
 ...ror-Log-IO-errors-in-the-VM-log-file.patch |    48 -
 ...I-O-error-reason-to-virStorageSource.patch |    55 -
 ...leIOError-Prefer-lookup-by-node-name.patch |    64 -
 ...or-to-extract-priv-instead-of-driver.patch |    76 -
 ...HandleIOError-Rename-local-variables.patch |    59 -
 ...nly-to-virStorageSource-of-same-type.patch |    57 +
 ...rceIsSameLocation-with-NULL-argument.patch |    48 +
 ...-calling-virStorageSourceGetMetadata.patch |    75 +
 ...EachQcow2-Don-t-initialize-nrollback.patch |    36 -
 ...ateBackingStore-Remove-stale-comment.patch |    34 +
 ...try-as-curent-user-if-qemu-img-fails.patch |    97 +
 ...memory-for-all-vhost-user-interfaces.patch |    62 -
 ...t-qemu_agent-Add-qemuAgentGetLoadAvg.patch |   163 -
 ...es-Fetch-caps-for-virtio-mem-ccw-too.patch |   409 -
 ...ter-deprecated-features-if-requested.patch |    95 -
 ...y-deprecated-features-for-host-model.patch |   933 -
 ...duce-QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW.patch |    76 -
 ...use-host-property-if-IOMMUFD-is-used.patch |   134 +
 ...t-building-IOMMUFD-props-to-function.patch |    73 +
 ...-line-for-virtio-mem-and-virtio-pmem.patch |    95 -
 ...u_domain-Add-missing-IOMMUFD-cleanup.patch |    33 +
 ...n_address-fix-CCW-virtio-mem-hotplug.patch |    48 -
 ...-to-hotplug-host-device-with-IOMMUFD.patch |   134 +
 ...etwork-inteface-with-hostdev-network.patch |    96 +
 ...e-iommufd-object-if-no-longer-needed.patch |    40 +
 ...nitor-in-order-to-rollback-passed-FD.patch |    46 +
 ...ically-resume-domain-after-I-O-error.patch |    38 -
 ...post-copy-active-in-postcopy-recover.patch |    57 -
 ...r-qemuMigrationSrcRestoreDomainState.patch |   110 -
 ...-multiple-host-devices-using-IOMMUFD.patch |    48 +
 ...cess-Refactor-qemuProcessOpenIommuFd.patch |    72 +
 ...Refactor-qemuProcessOpenVfioDeviceFd.patch |    75 +
 ...cess-Refactor-qemuProcessOpenVfioFds.patch |    77 +
 ...rting-to-external-disk-only-snapshot.patch |    50 -
 ...endency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch |    69 +
 ...endency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch |    47 +
 ...l-nodenames-in-testQemuDetectBitmaps.patch |   175 +
 ...or-the-qemu-10.0-dev-cycle-on-x86_64.patch | 54292 ----------------
 ....0_x86_64-to-v9.2.0-1636-gffaf7f0376.patch | 13228 ----
 ...with-writable-flag-in-disk-source-fd.patch |   164 -
 ...itable-flag-for-passed-FDs-for-disks.patch |    71 -
 ...fault-cpu-.ccw-virtio-2.7-test-cases.patch |   242 -
 ...ared-memory-net-vhostuser-test-cases.patch |   144 -
 ...ory-hotplug-virtio-mem-ccw-s390x.xml.patch |   215 -
 ...ory-hotplug-virtio-mem-pci-s390x.xml.patch |   228 -
 ...est-Refactor-host-device-preparation.patch |   101 +
 ...refactor-testSetupHostdevPrivateData.patch |    78 +
 ...uxmlconftest-Set-fake-FD-for-IOMMUFD.patch |    98 +
 ...mucapabilitiesdata-caps_10.0.0_s390x.patch |   534 -
 ...ysusers-file-to-create-libvirt-group.patch |    56 -
 ...move-logind-support-for-virNetDaemon.patch |   202 -
 ...unset-in-virDomainInterfaceAddresses.patch |    98 +
 ...rivers-over-to-new-virInhibitor-APIs.patch |   549 -
 ...duce-raw-and-rawset-ACPI-table-types.patch |   167 -
 ...PI-table-types-in-libxl-qemu-drivers.patch |    94 -
 ...mages-with-empty-string-as-data_file.patch |    56 -
 ...de-modularize-the-local-file-backend.patch |   117 -
 ...ls_i386-Generate-missing-v1-variants.patch |    37 -
 ..._qemu_models_i386-Update-meson.build.patch |    68 -
 ...tests-Test-virFileIsSharedFSOverride.patch |   111 +
 ...apabilities-for-QEMU-10.0.0-on-s390x.patch | 42185 ------------
 ...-properly-mock-VFIO-and-IOMMU-checks.patch |   113 +
 ...vide-iommufd-sample-XML-and-CLI-args.patch |   634 +
 ...domain-status-before-parsing-its-CID.patch |    43 -
 ...ndition-in-virFileIsSharedFSOverride.patch |   114 +
 ...e-condition-in-virFileIsSharedFSType.patch |   144 +
 ...-virNetDevOpenvswitchInterfaceSetQos.patch |    41 -
 ...-openning-IOMMU-device-to-viriommufd.patch |   115 +
 ...-Move-openning-VFIO-device-to-virpci.patch |   123 +
 ...FSOverride-using-virFileCheckParents.patch |    84 +
 ...-argument-in-virPCIDeviceGetVfioPath.patch |   143 +
 ...re-logind-inhibitor-if-not-requested.patch |    52 -
 ...-fix-off-by-1-in-inhibitor-constants.patch |    46 -
 ...-for-holding-a-system-inhibitor-lock.patch |   375 -
 ...ON-nesting-limit-when-parsing-to-300.patch |    50 +
 ...nicalize-paths-before-comparing-them.patch |    55 -
 ...ntroduce-VIR_DOMAIN_MESSAGE_IOERRORS.patch |   210 -
 ...GetMessages-Refactor-using-GPtrArray.patch |   191 -
 ...nExternalNames-Improve-error-message.patch |    37 +
 ...-the-case-when-fake-data-is-reported.patch |    47 -
 ...s-for-storing-last-I-O-error-message.patch |    72 -
 ...rjsontest-Add-test-for-nesting-depth.patch |    45 +
 ...pport-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch |    71 -
 ...ce-new-hypervisor-cpu-models-command.patch |   160 -
 ...ted-features-flag-to-domcapabilities.patch |    79 -
 ...image-with-empty-string-as-data_file.patch |    63 -
 SPECS/libvirt.spec                            |   567 +-
 234 files changed, 18944 insertions(+), 150122 deletions(-)
 delete mode 100644 SOURCES/libvirt-Add-load-average-information-type-into-virDomainGetGuestInfo.patch
 create mode 100644 SOURCES/libvirt-Expose-latency-histograms-via-virConnectGetAllDomainStats.patch
 create mode 100644 SOURCES/libvirt-Introduce-support-for-disk-operation-latency-histogram-collection.patch
 create mode 100644 SOURCES/libvirt-RHEL-ONLY-backport-test-data-for-migrate-pr-capability-of-scsi-block.patch
 delete mode 100644 SOURCES/libvirt-build-Bump-minimum-glib2-version-to-2.66.0.patch
 delete mode 100644 SOURCES/libvirt-conf-Adjust-hyperv-tlbflush-formatting.patch
 create mode 100644 SOURCES/libvirt-conf-Introduce-iommufd-enum-for-domaincaps.patch
 create mode 100644 SOURCES/libvirt-conf-Introduce-virDomainDefHasPCIHostdevWithIOMMUFD.patch
 create mode 100644 SOURCES/libvirt-conf-Introduce-virHostdevIsPCIDeviceWithIOMMUFD.patch
 delete mode 100644 SOURCES/libvirt-conf-add-deprecated_features-attribute.patch
 delete mode 100644 SOURCES/libvirt-conf-add-passthrough-and-xtsup-attributes-for-IOMMU.patch
 delete mode 100644 SOURCES/libvirt-conf-change-virDomainHostdevInsert-to-return-void.patch
 delete mode 100644 SOURCES/libvirt-conf-docs-Add-support-for-direct-and-extended-tlbflush-features.patch
 delete mode 100644 SOURCES/libvirt-conf-introduce-support-for-multiple-ACPI-tables.patch
 delete mode 100644 SOURCES/libvirt-conf-parse-interface-source-dev-for-all-interface-types-with-backend-type-passt.patch
 delete mode 100644 SOURCES/libvirt-conf-qemu-make-source-element-almost-optional-for-type-vhostuser.patch
 delete mode 100644 SOURCES/libvirt-conf-refactor-hyperv-features-formatting.patch
 delete mode 100644 SOURCES/libvirt-conf-support-MSDM-ACPI-table-type.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-486-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-GraniteRapids-v2-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-athlon-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-avx10-CPU-features.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-n270-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-pentium-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-phenom-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-sha512-sm3-and-sm4-CPU-features.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Sort-data-files-in-meson.build.patch
 delete mode 100644 SOURCES/libvirt-docs-document-using-passt-backend-with-interface-type-vhostuser.patch
 create mode 100644 SOURCES/libvirt-docs-formatdomain-Fix-indentation-of-docs-for-disk-driver-statistics-element.patch
 create mode 100644 SOURCES/libvirt-docs-formatdomain-Reword-section-about-the-statistics-element-under-disk-driver.patch
 delete mode 100644 SOURCES/libvirt-docs-formatdomain-document-intel-only-IOMMU-attributes.patch
 delete mode 100644 SOURCES/libvirt-docs-improve-type-user-docs-to-higlight-differences-between-SLIRP-and-passt.patch
 create mode 100644 SOURCES/libvirt-domain_conf-initialize-network-hostdev-private-data.patch
 delete mode 100644 SOURCES/libvirt-esx-Accept-empty-path-URI-component-same-way-as.patch
 delete mode 100644 SOURCES/libvirt-esx-Allow-specifying-different-CA-bundle-for-remote-connections.patch
 create mode 100644 SOURCES/libvirt-esx-URI-encode-inventory-objects-twice.patch
 delete mode 100644 SOURCES/libvirt-esxConnectListAllDomains-Don-t-propagate-failure-to-lookup-a-single-domain.patch
 create mode 100644 SOURCES/libvirt-esx_util-Introduce-esxUtil_EscapeInventoryObject.patch
 delete mode 100644 SOURCES/libvirt-include-libvirt-domain-Add-message-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch
 delete mode 100644 SOURCES/libvirt-include-libvirt-domain-Reword-documentation-for-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch
 create mode 100644 SOURCES/libvirt-iommufd-fix-FD-leak-in-case-of-error.patch
 delete mode 100644 SOURCES/libvirt-libvirt-domain-introduce-VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES.patch
 delete mode 100644 SOURCES/libvirt-libvirt-host-Clarify-fix-description-of-the-CPU-frequency-field.patch
 delete mode 100644 SOURCES/libvirt-libxl-support-rawset-ACPI-table-type.patch
 delete mode 100644 SOURCES/libvirt-libxlDomainGetMessages-Add-existing-flags-to-virCheckFlags.patch
 delete mode 100644 SOURCES/libvirt-manpages-virsh-Use-disclaimer-from-virNodeGetInfo-for-virsh-nodeinfo.patch
 delete mode 100644 SOURCES/libvirt-network-Free-inhibitor-in-networkStateCleanup.patch
 delete mode 100644 SOURCES/libvirt-qemu-Add-support-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch
 delete mode 100644 SOURCES/libvirt-qemu-Add-support-for-direct-and-extended-tlbflush-features.patch
 delete mode 100644 SOURCES/libvirt-qemu-Allow-virtio-mem-on-CCW.patch
 delete mode 100644 SOURCES/libvirt-qemu-Avoid-crash-in-qemuDomainCheckCPU-with-unknown-host-CPU.patch
 create mode 100644 SOURCES/libvirt-qemu-Convert-IOMMUFD-to-qemuFDPassDirect.patch
 create mode 100644 SOURCES/libvirt-qemu-Convert-vfioDeviceFd-to-qemuFDPassDirect.patch
 delete mode 100644 SOURCES/libvirt-qemu-Do-NOT-autoadd-NUMA-node-for-s390.patch
 delete mode 100644 SOURCES/libvirt-qemu-Enable-I-O-APIC-even-more-frequently.patch
 delete mode 100644 SOURCES/libvirt-qemu-Enable-I-O-APIC-if-needed.patch
 create mode 100644 SOURCES/libvirt-qemu-Extract-disk-setup-done-via-QMP-into-a-separate-helper.patch
 create mode 100644 SOURCES/libvirt-qemu-Fill-iommufd-domain-capability.patch
 delete mode 100644 SOURCES/libvirt-qemu-Handle-quirks-of-device-field-of-BLOCK_IO_ERROR-event-in-monitor-code.patch
 create mode 100644 SOURCES/libvirt-qemu-Ignore-cmp_legacy-CPU-flag.patch
 create mode 100644 SOURCES/libvirt-qemu-Implement-support-for-associating-iommufd-to-hostdev.patch
 create mode 100644 SOURCES/libvirt-qemu-Implement-support-for-persistent-reservation-migration-control.patch
 create mode 100644 SOURCES/libvirt-qemu-Introduce-QEMU_CAPS_OBJECT_IOMMUFD.patch
 create mode 100644 SOURCES/libvirt-qemu-Introduce-privateData-for-hostdevs.patch
 create mode 100644 SOURCES/libvirt-qemu-Move-IOMMUFD-validation-to-qemu_validate.patch
 delete mode 100644 SOURCES/libvirt-qemu-Properly-propagate-migration-state-to-TPM-cleanup-code.patch
 delete mode 100644 SOURCES/libvirt-qemu-Rename-diskAlias-to-device-in-qemu-IO-error-event-handling.patch
 delete mode 100644 SOURCES/libvirt-qemu-Rename-outgoingMigration-parameter-in-various-TPM-functions.patch
 create mode 100644 SOURCES/libvirt-qemu-Save-IOMMUFD-state-into-status-XML.patch
 create mode 100644 SOURCES/libvirt-qemu-Setup-disk-latency-histograms-on-startup-hotplug-update.patch
 create mode 100644 SOURCES/libvirt-qemu-Support-per-process-memory-accounting-for-iommufd.patch
 create mode 100644 SOURCES/libvirt-qemu-Update-Cgroup-namespace-and-seclabel-for-iommufd.patch
 delete mode 100644 SOURCES/libvirt-qemu-Validate-virtio-mem-ccw.patch
 delete mode 100644 SOURCES/libvirt-qemu-add-IOMMU-model-amd.patch
 delete mode 100644 SOURCES/libvirt-qemu-add-ability-to-set-TLS-priority-string-with-QEMU.patch
 delete mode 100644 SOURCES/libvirt-qemu-allow-migration-of-guest-with-mdev-vGPU-to-VF-vGPU.patch
 delete mode 100644 SOURCES/libvirt-qemu-automatically-set-model-type-virtio-for-interface-type-vhostuser.patch
 delete mode 100644 SOURCES/libvirt-qemu-capabilies-Introduce-QEMU_CAPS_BLOCKDEV_SET_ACTIVE.patch
 create mode 100644 SOURCES/libvirt-qemu-capabilities-Introduce-QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR.patch
 create mode 100644 SOURCES/libvirt-qemu-capabilities-Probe-properties-of-scsi-block-and-scsi-generic-devices.patch
 delete mode 100644 SOURCES/libvirt-qemu-complete-vhostuser-passt-support.patch
 delete mode 100644 SOURCES/libvirt-qemu-do-all-vhostuser-attribute-validation-in-qemu-driver.patch
 delete mode 100644 SOURCES/libvirt-qemu-domain-Initialize-FD-passthrough-for-a-virStorageSource-before-using-it.patch
 delete mode 100644 SOURCES/libvirt-qemu-fail-validation-if-a-domain-def-has-vhostuser-passt-but-no-shared-mem.patch
 delete mode 100644 SOURCES/libvirt-qemu-fix-order-of-VNC-TLS-config-entries.patch
 delete mode 100644 SOURCES/libvirt-qemu-fix-qemu-validation-to-forbid-guest-side-IP-address-for-type-vdpa.patch
 delete mode 100644 SOURCES/libvirt-qemu-introduce-QEMU_CAPS_AMD_IOMMU.patch
 delete mode 100644 SOURCES/libvirt-qemu-introduce-QEMU_CAPS_PCI_ID.patch
 delete mode 100644 SOURCES/libvirt-qemu-make-passt-vhostuser-reconnect-behave-identically-to-passt-user.patch
 delete mode 100644 SOURCES/libvirt-qemu-make-processNetDevStreamDisconnectedEvent-reusable.patch
 delete mode 100644 SOURCES/libvirt-qemu-make-qemuPasstCreateSocketPath-public.patch
 create mode 100644 SOURCES/libvirt-qemu-migration-Always-offer-block-dirty-bitmaps-during-migration.patch
 delete mode 100644 SOURCES/libvirt-qemu-migration-Reactivate-block-nodes-after-migration-if-VM-is-left-paused.patch
 create mode 100644 SOURCES/libvirt-qemu-monitor-Add-handlers-for-block-latency-histogram-set.patch
 delete mode 100644 SOURCES/libvirt-qemu-monitor-Add-monitor-backend-for-blockdev-set-active.patch
 create mode 100644 SOURCES/libvirt-qemu-monitor-Detect-list-of-bitmaps-from-qcow2-format-specific-data.patch
 create mode 100644 SOURCES/libvirt-qemu-monitor-Extract-block-latency-histogram-stats-into-qemuBlockStats.patch
 create mode 100644 SOURCES/libvirt-qemu-open-VFIO-FDs-from-libvirt-backend.patch
 create mode 100644 SOURCES/libvirt-qemu-open-iommufd-FD-from-libvirt-backend.patch
 delete mode 100644 SOURCES/libvirt-qemu-parse-deprecated-props-from-query-cpu-model-expansion-response.patch
 delete mode 100644 SOURCES/libvirt-qemu-process-Export-qemuPrepareNVRAM-for-use-in-snapshot-code.patch
 delete mode 100644 SOURCES/libvirt-qemu-process-Remove-un-updated-qemuProcessStartWarnShmem.patch
 create mode 100644 SOURCES/libvirt-qemu-process-Rename-qemuProcessSetupDiskThrottling-to-qemuProcessSetupDisks.patch
 delete mode 100644 SOURCES/libvirt-qemu-put-vhost-user-code-that-s-special-for-passt-in-a-helper-function.patch
 delete mode 100644 SOURCES/libvirt-qemu-re-use-existing-ActualNetDef-for-more-interface-types-during-update-device.patch
 delete mode 100644 SOURCES/libvirt-qemu-remove-nonsensical-sanity-check-in-processNetdevStreamDisconnectedEvent.patch
 delete mode 100644 SOURCES/libvirt-qemu-respond-to-NETDEV_VHOST_USER_DISCONNECTED-event.patch
 delete mode 100644 SOURCES/libvirt-qemu-sanitize-blank-lines-in-config-file.patch
 delete mode 100644 SOURCES/libvirt-qemu-snapshot-Ensure-that-NVRAM-image-exists-when-taking-inactive-internal-snapshot.patch
 delete mode 100644 SOURCES/libvirt-qemu-snapshot-delete-disk-image-only-if-parent-snapshot-is-external.patch
 delete mode 100644 SOURCES/libvirt-qemu-snapshot-error-out-early-when-reverting-snapshot-for-VM-with-non-file-disk.patch
 delete mode 100644 SOURCES/libvirt-qemu-support-MSDM-ACPI-table-type.patch
 delete mode 100644 SOURCES/libvirt-qemu-support-raw-ACPI-table-type.patch
 create mode 100644 SOURCES/libvirt-qemu-tpm-Account-for-possible-migration-without-actually-sharing-storage.patch
 delete mode 100644 SOURCES/libvirt-qemu-tpm-do-not-update-profile-name-for-transient-domains.patch
 delete mode 100644 SOURCES/libvirt-qemu-use-switch-instead-of-if-in-qemuProcessPrepareDomainNetwork.patch
 delete mode 100644 SOURCES/libvirt-qemu-validate-that-model-is-virtio-for-vhostuser-and-vdpa-interfaces-in-the-same-place.patch
 delete mode 100644 SOURCES/libvirt-qemuDomainBlockCopyCommon-Don-t-revoke-access-to-file-twice-on-failure.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSetBlockIoTuneField-Move-setting-of-group_name-out-of-the-loop.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSetThrottleGroup-Always-honour-thottle-group-name-passed-as-argument.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSetThrottleGroup-Don-t-put-group-name-into-the-tunable-event-twice.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSetThrottleGroup-Enforce-non-zero-groupname-string-length.patch
 create mode 100644 SOURCES/libvirt-qemuMigrationDstPrepareAnyBlockDirtyBitmaps-Always-consider-offered-bitmaps.patch
 create mode 100644 SOURCES/libvirt-qemuMigrationDstPrepareAnyBlockDirtyBitmaps-Fix-check-for-existing-bitmaps.patch
 delete mode 100644 SOURCES/libvirt-qemuMonitorJSONGetCPUModelExpansion-refactor-parsing-functions.patch
 delete mode 100644 SOURCES/libvirt-qemuMonitorJSONHandleIOError-Do-not-munge-reason-field-of-IO-error-event.patch
 delete mode 100644 SOURCES/libvirt-qemuMonitorJSONHandleIOError-Propagate-new-qom-path-field.patch
 delete mode 100644 SOURCES/libvirt-qemuPrepareNVRAMFile-Fix-NVRAM-image-conversion-check.patch
 delete mode 100644 SOURCES/libvirt-qemuProcessHandleIOError-Log-IO-errors-in-the-VM-log-file.patch
 delete mode 100644 SOURCES/libvirt-qemuProcessHandleIOError-Populate-I-O-error-reason-to-virStorageSource.patch
 delete mode 100644 SOURCES/libvirt-qemuProcessHandleIOError-Prefer-lookup-by-node-name.patch
 delete mode 100644 SOURCES/libvirt-qemuProcessHandleIOError-Refactor-to-extract-priv-instead-of-driver.patch
 delete mode 100644 SOURCES/libvirt-qemuProcessHandleIOError-Rename-local-variables.patch
 create mode 100644 SOURCES/libvirt-qemuSecurityMoveImageMetadata-Move-seclabels-only-to-virStorageSource-of-same-type.patch
 create mode 100644 SOURCES/libvirt-qemuSnapshotDiskHasBackingDisk-Avoid-call-of-virStorageSourceIsSameLocation-with-NULL-argument.patch
 create mode 100644 SOURCES/libvirt-qemuSnapshotDiskHasBackingDisk-Use-proper-max_depth-when-calling-virStorageSourceGetMetadata.patch
 delete mode 100644 SOURCES/libvirt-qemuSnapshotForEachQcow2-Don-t-initialize-nrollback.patch
 create mode 100644 SOURCES/libvirt-qemuSnapshotUpdateBackingStore-Remove-stale-comment.patch
 create mode 100644 SOURCES/libvirt-qemuSnapshotUpdateBackingStore-Retry-as-curent-user-if-qemu-img-fails.patch
 delete mode 100644 SOURCES/libvirt-qemuValidateDomainDeviceDefNetwork-Require-shared-memory-for-all-vhost-user-interfaces.patch
 delete mode 100644 SOURCES/libvirt-qemu_agent-Add-qemuAgentGetLoadAvg.patch
 delete mode 100644 SOURCES/libvirt-qemu_capabilities-Fetch-caps-for-virtio-mem-ccw-too.patch
 delete mode 100644 SOURCES/libvirt-qemu_capabilities-filter-deprecated-features-if-requested.patch
 delete mode 100644 SOURCES/libvirt-qemu_capabilities-query-deprecated-features-for-host-model.patch
 delete mode 100644 SOURCES/libvirt-qemu_caps-Introduce-QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW.patch
 create mode 100644 SOURCES/libvirt-qemu_command-Don-t-use-host-property-if-IOMMUFD-is-used.patch
 create mode 100644 SOURCES/libvirt-qemu_command-Extract-building-IOMMUFD-props-to-function.patch
 delete mode 100644 SOURCES/libvirt-qemu_command-Use-qemuBuildVirtioDevProps-to-build-cmd-line-for-virtio-mem-and-virtio-pmem.patch
 create mode 100644 SOURCES/libvirt-qemu_domain-Add-missing-IOMMUFD-cleanup.patch
 delete mode 100644 SOURCES/libvirt-qemu_domain_address-fix-CCW-virtio-mem-hotplug.patch
 create mode 100644 SOURCES/libvirt-qemu_hotplug-Add-support-to-hotplug-host-device-with-IOMMUFD.patch
 create mode 100644 SOURCES/libvirt-qemu_hotplug-Fix-crash-when-attaching-network-inteface-with-hostdev-network.patch
 create mode 100644 SOURCES/libvirt-qemu_hotplug-Remove-iommufd-object-if-no-longer-needed.patch
 create mode 100644 SOURCES/libvirt-qemu_hotplug-enter-monitor-in-order-to-rollback-passed-FD.patch
 delete mode 100644 SOURCES/libvirt-qemu_migration-Do-not-automatically-resume-domain-after-I-O-error.patch
 delete mode 100644 SOURCES/libvirt-qemu_migration-Do-not-consider-post-copy-active-in-postcopy-recover.patch
 delete mode 100644 SOURCES/libvirt-qemu_migration-Refactor-qemuMigrationSrcRestoreDomainState.patch
 create mode 100644 SOURCES/libvirt-qemu_process-Fix-FD-leak-with-multiple-host-devices-using-IOMMUFD.patch
 create mode 100644 SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenIommuFd.patch
 create mode 100644 SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenVfioDeviceFd.patch
 create mode 100644 SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenVfioFds.patch
 delete mode 100644 SOURCES/libvirt-qemu_snapshot-allow-reverting-to-external-disk-only-snapshot.patch
 create mode 100644 SOURCES/libvirt-qemu_validate-Drop-VIR_DOMAIN_HYPERV_STIMER-dependency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch
 create mode 100644 SOURCES/libvirt-qemu_validate-Drop-VIR_DOMAIN_HYPERV_SYNIC-dependency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Iterate-all-nodenames-in-testQemuDetectBitmaps.patch
 delete mode 100644 SOURCES/libvirt-qemucapabilitiestest-Add-data-for-the-qemu-10.0-dev-cycle-on-x86_64.patch
 delete mode 100644 SOURCES/libvirt-qemucapabilitiestest-Update-caps_10.0.0_x86_64-to-v9.2.0-1636-gffaf7f0376.patch
 delete mode 100644 SOURCES/libvirt-qemuxmlconftest-Add-testing-of-FDs-with-writable-flag-in-disk-source-fd.patch
 delete mode 100644 SOURCES/libvirt-qemuxmlconftest-Allow-testing-of-the-writable-flag-for-passed-FDs-for-disks.patch
 delete mode 100644 SOURCES/libvirt-qemuxmlconftest-Drop-s390-default-cpu-.ccw-virtio-2.7-test-cases.patch
 delete mode 100644 SOURCES/libvirt-qemuxmlconftest-Include-shared-memory-net-vhostuser-test-cases.patch
 delete mode 100644 SOURCES/libvirt-qemuxmlconftest-Introduce-memory-hotplug-virtio-mem-ccw-s390x.xml.patch
 delete mode 100644 SOURCES/libvirt-qemuxmlconftest-Introduce-memory-hotplug-virtio-mem-pci-s390x.xml.patch
 create mode 100644 SOURCES/libvirt-qemuxmlconftest-Refactor-host-device-preparation.patch
 create mode 100644 SOURCES/libvirt-qemuxmlconftest-Rename-and-refactor-testSetupHostdevPrivateData.patch
 create mode 100644 SOURCES/libvirt-qemuxmlconftest-Set-fake-FD-for-IOMMUFD.patch
 delete mode 100644 SOURCES/libvirt-redhat-Restore-hunks-in-tests-qemucapabilitiesdata-caps_10.0.0_s390x.patch
 delete mode 100644 SOURCES/libvirt-remote-add-sysusers-file-to-create-libvirt-group.patch
 delete mode 100644 SOURCES/libvirt-rpc-remove-logind-support-for-virNetDaemon.patch
 create mode 100644 SOURCES/libvirt-src-Use-device-alias-when-ifname-is-unset-in-virDomainInterfaceAddresses.patch
 delete mode 100644 SOURCES/libvirt-src-convert-drivers-over-to-new-virInhibitor-APIs.patch
 delete mode 100644 SOURCES/libvirt-src-introduce-raw-and-rawset-ACPI-table-types.patch
 delete mode 100644 SOURCES/libvirt-src-validate-permitted-ACPI-table-types-in-libxl-qemu-drivers.patch
 delete mode 100644 SOURCES/libvirt-storage_file-Refuse-qcow2-images-with-empty-string-as-data_file.patch
 delete mode 100644 SOURCES/libvirt-storage_file-de-modularize-the-local-file-backend.patch
 delete mode 100644 SOURCES/libvirt-sync_qemu_models_i386-Generate-missing-v1-variants.patch
 delete mode 100644 SOURCES/libvirt-sync_qemu_models_i386-Update-meson.build.patch
 create mode 100644 SOURCES/libvirt-tests-Test-virFileIsSharedFSOverride.patch
 delete mode 100644 SOURCES/libvirt-tests-add-capabilities-for-QEMU-10.0.0-on-s390x.patch
 create mode 100644 SOURCES/libvirt-tests-properly-mock-VFIO-and-IOMMU-checks.patch
 create mode 100644 SOURCES/libvirt-tests-qemuxmlconfdata-provide-iommufd-sample-XML-and-CLI-args.patch
 delete mode 100644 SOURCES/libvirt-tools-ssh-proxy-Check-for-domain-status-before-parsing-its-CID.patch
 create mode 100644 SOURCES/libvirt-util-Fix-race-condition-in-virFileIsSharedFSOverride.patch
 create mode 100644 SOURCES/libvirt-util-Fix-race-condition-in-virFileIsSharedFSType.patch
 delete mode 100644 SOURCES/libvirt-util-Fix-typo-in-virNetDevOpenvswitchInterfaceSetQos.patch
 create mode 100644 SOURCES/libvirt-util-Move-openning-IOMMU-device-to-viriommufd.patch
 create mode 100644 SOURCES/libvirt-util-Move-openning-VFIO-device-to-virpci.patch
 create mode 100644 SOURCES/libvirt-util-Rework-virFileIsSharedFSOverride-using-virFileCheckParents.patch
 create mode 100644 SOURCES/libvirt-util-Use-virPCIDevice-as-argument-in-virPCIDeviceGetVfioPath.patch
 delete mode 100644 SOURCES/libvirt-util-don-t-attempt-to-acquire-logind-inhibitor-if-not-requested.patch
 delete mode 100644 SOURCES/libvirt-util-fix-off-by-1-in-inhibitor-constants.patch
 delete mode 100644 SOURCES/libvirt-util-introduce-object-for-holding-a-system-inhibitor-lock.patch
 create mode 100644 SOURCES/libvirt-util-json-Increase-JSON-nesting-limit-when-parsing-to-300.patch
 delete mode 100644 SOURCES/libvirt-utils-Canonicalize-paths-before-comparing-them.patch
 delete mode 100644 SOURCES/libvirt-virDomainGetMessages-Introduce-VIR_DOMAIN_MESSAGE_IOERRORS.patch
 delete mode 100644 SOURCES/libvirt-virDomainObjGetMessages-Refactor-using-GPtrArray.patch
 create mode 100644 SOURCES/libvirt-virDomainSnapshotDefAssignExternalNames-Improve-error-message.patch
 delete mode 100644 SOURCES/libvirt-virNodeGetInfo-Improve-description-of-the-case-when-fake-data-is-reported.patch
 delete mode 100644 SOURCES/libvirt-virStorageSource-Add-fields-for-storing-last-I-O-error-message.patch
 create mode 100644 SOURCES/libvirt-virjsontest-Add-test-for-nesting-depth.patch
 delete mode 100644 SOURCES/libvirt-virsh-Add-support-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch
 delete mode 100644 SOURCES/libvirt-virsh-Introduce-new-hypervisor-cpu-models-command.patch
 delete mode 100644 SOURCES/libvirt-virsh-add-disable-deprecated-features-flag-to-domcapabilities.patch
 delete mode 100644 SOURCES/libvirt-virstoragetest-Add-case-for-qcow2-image-with-empty-string-as-data_file.patch

diff --git a/.gitignore b/.gitignore
index 3f04786..eb9aad1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libvirt-10.10.0.tar.xz
+SOURCES/libvirt-11.10.0.tar.xz
diff --git a/.libvirt.metadata b/.libvirt.metadata
index 954575b..85fa0db 100644
--- a/.libvirt.metadata
+++ b/.libvirt.metadata
@@ -1 +1 @@
-7e76874bdcd1b220d90619c1ce7a876b6c9a8d78 SOURCES/libvirt-10.10.0.tar.xz
+f36316de87378f52ae9c237d936c28b0f3210253 SOURCES/libvirt-11.10.0.tar.xz
diff --git a/SOURCES/libvirt-Add-load-average-information-type-into-virDomainGetGuestInfo.patch b/SOURCES/libvirt-Add-load-average-information-type-into-virDomainGetGuestInfo.patch
deleted file mode 100644
index 224dd74..0000000
--- a/SOURCES/libvirt-Add-load-average-information-type-into-virDomainGetGuestInfo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9874072fc9396d609f1a0213bb06fa7e9a2fa019 Mon Sep 17 00:00:00 2001
-Message-ID: <9874072fc9396d609f1a0213bb06fa7e9a2fa019.1747908717.git.jdenemar@redhat.com>
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Tue, 25 Feb 2025 15:36:03 +0100
-Subject: [PATCH] Add load average information type into virDomainGetGuestInfo
-
-The public API part.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit c52c449fd40c7263896d5f17129207b815c3a09c)
-
-https://issues.redhat.com/browse/RHEL-88447
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
----
- include/libvirt/libvirt-domain.h | 1 +
- src/libvirt-domain.c             | 8 ++++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index f026ce197c..c04b696f03 100644
---- a/include/libvirt/libvirt-domain.h
-+++ b/include/libvirt/libvirt-domain.h
-@@ -6425,6 +6425,7 @@ typedef enum {
-     VIR_DOMAIN_GUEST_INFO_FILESYSTEM = (1 << 4), /* return filesystem information (Since: 5.7.0) */
-     VIR_DOMAIN_GUEST_INFO_DISKS = (1 << 5), /* return disks information (Since: 7.0.0) */
-     VIR_DOMAIN_GUEST_INFO_INTERFACES = (1 << 6), /* return interfaces information (Since: 7.10.0) */
-+    VIR_DOMAIN_GUEST_INFO_LOAD = (1 << 7), /* return load averages (Since: 11.2.0) */
- } virDomainGuestInfoTypes;
- 
- int virDomainGetGuestInfo(virDomainPtr domain,
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index 7c6b93963c..24752a9888 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -13292,6 +13292,14 @@ virDomainSetVcpu(virDomainPtr domain,
-  *      "if.<num>.addr.<num1>.addr" - the IP address of addr <num1>
-  *      "if.<num>.addr.<num1>.prefix" - the prefix of IP address of addr <num1>
-  *
-+ * VIR_DOMAIN_GUEST_INFO_LOAD:
-+ *  Returns load (the number of processes in the runqueue or waiting for disk
-+ *  I/O) as double values:
-+ *
-+ *      "load.1m" - load averaged over 1 minute
-+ *      "load.5m" - load averaged over 5 minutes
-+ *      "load.15m" - load averaged over 15 minutes
-+ *
-  * Using 0 for @types returns all information groups supported by the given
-  * hypervisor.
-  *
--- 
-2.49.0
diff --git a/SOURCES/libvirt-Expose-latency-histograms-via-virConnectGetAllDomainStats.patch b/SOURCES/libvirt-Expose-latency-histograms-via-virConnectGetAllDomainStats.patch
new file mode 100644
index 0000000..696d10b
--- /dev/null
+++ b/SOURCES/libvirt-Expose-latency-histograms-via-virConnectGetAllDomainStats.patch
@@ -0,0 +1,248 @@
+From d3031b230cc8300541a3ec39bf80b78d11ac15d6 Mon Sep 17 00:00:00 2001
+Message-ID: <d3031b230cc8300541a3ec39bf80b78d11ac15d6.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 29 Jan 2026 18:10:26 +0100
+Subject: [PATCH] Expose latency histograms via 'virConnectGetAllDomainStats'
+
+Add documentation and constants for constructing the stats field names
+for latency histograms and expose them in the qemu driver:
+
+Example:
+
+  block.1.latency_histogram.read.bin.count=9
+  block.1.latency_histogram.read.bin.0.start=0
+  block.1.latency_histogram.read.bin.0.value=0
+  block.1.latency_histogram.read.bin.1.start=10
+  block.1.latency_histogram.read.bin.1.value=0
+  block.1.latency_histogram.read.bin.2.start=100
+  block.1.latency_histogram.read.bin.2.value=0
+  block.1.latency_histogram.read.bin.3.start=1000
+  block.1.latency_histogram.read.bin.3.value=1047
+  block.1.latency_histogram.read.bin.4.start=10000
+  block.1.latency_histogram.read.bin.4.value=2131
+  block.1.latency_histogram.read.bin.5.start=100000
+  block.1.latency_histogram.read.bin.5.value=0
+  block.1.latency_histogram.read.bin.6.start=1000000
+  block.1.latency_histogram.read.bin.6.value=0
+  block.1.latency_histogram.read.bin.7.start=10000000
+  block.1.latency_histogram.read.bin.7.value=0
+  block.1.latency_histogram.read.bin.8.start=100000000
+  block.1.latency_histogram.read.bin.8.value=0
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 237e49127a9390f054e33e689ba9db1587cdc9f1)
+
+https://issues.redhat.com/browse/RHEL-147866 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-131335 [rhel-10.2]
+---
+ docs/manpages/virsh.rst          |   7 ++
+ include/libvirt/libvirt-domain.h | 113 +++++++++++++++++++++++++++++++
+ src/qemu/qemu_driver.c           |  43 ++++++++++++
+ 3 files changed, 163 insertions(+)
+
+diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
+index a9d691824e..ff0cf1a715 100644
+--- a/docs/manpages/virsh.rst
++++ b/docs/manpages/virsh.rst
+@@ -2811,6 +2811,13 @@ Information listed includes:
+   pending write operations in the defined interval
+ * ``block.<num>.timed_group.<num>.zone_append_queue_depth_avg`` - average number
+   of pending zone append operations in the defined interval
++* ``block.<num>.latency_histogram.<type>.bin.count`` - number of bins in
++  latency histogram. <type> is one of ``read``, ``write``, ``zone_append``, or
++  ``flush``
++* ``block.<num>.latency_histogram.<type>.bin.<num>.start`` start boundary of
++  a latency histogram bin in nanoseconds of given operation duration
++* ``block.<num>.latency_histogram.<type>.bin.<num>.value`` current number of
++  events corresponding to the given bin and type
+ 
+ 
+ *--iothread* returns information about IOThreads on the running guest
+diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
+index 16fac6b085..8e62bd23d4 100644
+--- a/include/libvirt/libvirt-domain.h
++++ b/include/libvirt/libvirt-domain.h
+@@ -3815,6 +3815,119 @@ struct _virDomainStatsRecord {
+  */
+ # define VIR_DOMAIN_STATS_BLOCK_SUFFIX_TIMED_GROUP_SUFFIX_ZONE_APPEND_QUEUE_DEPTH_AVG ".zone_append_queue_depth_avg"
+ 
++/**
++ * VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_READ_PREFIX:
++ *
++ * The parameter name prefix to access 'read' latency histograms. Concatenate
++ * the prefix with either:
++ *  - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_COUNT
++ *    to get the number of bins in given histogram
++ *  - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_PREFIX and
++ *    entry number formatted as an unsigned integer and one of the latency
++ *    histogram suffix parameters to compelte a full bin parameter name
++ *
++ * Since: 12.1.0
++ */
++# define VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_READ_PREFIX ".latency_histogram.read."
++
++/**
++ * VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_WRITE_PREFIX:
++ *
++ * The parameter name prefix to access 'write' latency histograms. Concatenate
++ * the prefix with either:
++ *  - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_COUNT
++ *    to get the number of bins in given histogram
++ *  - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_PREFIX and
++ *    entry number formatted as an unsigned integer and one of the latency
++ *    histogram suffix parameters to compelte a full bin parameter name
++ *
++ * Since: 12.1.0
++ */
++# define VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_WRITE_PREFIX ".latency_histogram.write."
++
++/**
++ * VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_ZONE_APPEND_PREFIX:
++ *
++ * The parameter name prefix to access 'zone_append' latency histograms. Concatenate
++ * the prefix with either:
++ *  - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_COUNT
++ *    to get the number of bins in given histogram
++ *  - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_PREFIX and
++ *    entry number formatted as an unsigned integer and one of the latency
++ *    histogram suffix parameters to compelte a full bin parameter name
++ *
++ * Since: 12.1.0
++ */
++# define VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_ZONE_APPEND_PREFIX ".latency_histogram.zone_append."
++
++/**
++ * VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_FLUSH_PREFIX:
++ *
++ * The parameter name prefix to access 'flush' latency histograms. Concatenate
++ * the prefix with either:
++ *  - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_COUNT
++ *    to get the number of bins in given histogram
++ *  - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_PREFIX and
++ *    entry number formatted as an unsigned integer and one of the latency
++ *    histogram suffix parameters to compelte a full bin parameter name
++ *
++ * Since: 12.1.0
++ */
++# define VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_FLUSH_PREFIX ".latency_histogram.flush."
++
++/**
++ * VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_COUNT:
++ *
++ * The parameter name suffix to access number of bins in one of the following
++ * latency histogram types:
++ *   - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_READ_PREFIX
++ *   - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_WRITE_PREFIX
++ *   - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_ZONE_APPEND_PREFIX
++ *   - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_FLUSH_PREFIX
++ *
++ * Number of bins in latency histogram as unsigned long long.
++ *
++ * Since: 12.1.0
++ */
++# define VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_COUNT "bin.count"
++
++/**
++ * VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_PREFIX:
++ *
++ * The parameter name suffix to access a latency histogram bin in one of the
++ * following latency histogram types:
++ *   - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_READ_PREFIX
++ *   - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_WRITE_PREFIX
++ *   - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_ZONE_APPEND_PREFIX
++ *   - VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_FLUSH_PREFIX
++ *
++ * Concatenate with a bin number as unsigned int and one of the other field
++ * suffixes to access bin parameters.
++ *
++ * Since: 12.1.0
++ */
++# define VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_PREFIX "bin."
++
++/**
++ * VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_SUFFIX_START:
++ *
++ * Start of the current latency histogram bin in nanoseconds as unsigned long long.
++ *
++ * Since: 12.1.0
++ */
++# define VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_SUFFIX_START ".start"
++
++/**
++ * VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_SUFFIX_VALUE:
++ *
++ * Current value of the number of occurences of the latency within this bin
++ * as unsigned long long.
++ *
++ * Since: 12.1.0
++ */
++# define VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_SUFFIX_VALUE ".value"
++
++
+ /**
+  * VIR_DOMAIN_STATS_PERF_CMT:
+  *
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 08a547c546..f3e7410f9e 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17597,6 +17597,36 @@ qemuDomainGetStatsBlockExportBackendStorage(const char *entryname,
+ }
+ 
+ 
++static void
++qemuDomainGetStatsBlockExportFrontendLatencyHistogram(struct qemuBlockStatsLatencyHistogram *h,
++                                                      size_t disk_idx,
++                                                      const char *prefix_hist,
++                                                      virTypedParamList *par)
++{
++    size_t i;
++
++    if (!h)
++        return;
++
++    virTypedParamListAddULLong(par, h->nbins,
++                               VIR_DOMAIN_STATS_BLOCK_PREFIX "%zu%s" VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_COUNT,
++                               disk_idx, prefix_hist);
++
++    for (i = 0; i < h->nbins; i++) {
++        virTypedParamListAddULLong(par, h->bins[i].start,
++                                   VIR_DOMAIN_STATS_BLOCK_PREFIX "%zu%s"
++                                   VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_PREFIX "%zu"
++                                   VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_SUFFIX_START,
++                                   disk_idx, prefix_hist, i);
++        virTypedParamListAddULLong(par, h->bins[i].value,
++                                   VIR_DOMAIN_STATS_BLOCK_PREFIX "%zu%s"
++                                   VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_PREFIX "%zu"
++                                   VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_SUFFIX_BIN_SUFFIX_VALUE,
++                                   disk_idx, prefix_hist, i);
++    }
++}
++
++
+ static void
+ qemuDomainGetStatsBlockExportFrontend(const char *frontendname,
+                                       GHashTable *stats,
+@@ -17721,6 +17751,19 @@ qemuDomainGetStatsBlockExportFrontend(const char *frontendname,
+                                        idx, i);
+         }
+     }
++
++    qemuDomainGetStatsBlockExportFrontendLatencyHistogram(en->histogram_read, idx,
++                                                          VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_READ_PREFIX,
++                                                          par);
++    qemuDomainGetStatsBlockExportFrontendLatencyHistogram(en->histogram_write, idx,
++                                                          VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_WRITE_PREFIX,
++                                                          par);
++    qemuDomainGetStatsBlockExportFrontendLatencyHistogram(en->histogram_zone, idx,
++                                                          VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_ZONE_APPEND_PREFIX,
++                                                          par);
++    qemuDomainGetStatsBlockExportFrontendLatencyHistogram(en->histogram_flush, idx,
++                                                          VIR_DOMAIN_STATS_BLOCK_SUFFIX_LATENCY_HISTOGRAM_FLUSH_PREFIX,
++                                                          par);
+ }
+ 
+ 
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-Introduce-support-for-disk-operation-latency-histogram-collection.patch b/SOURCES/libvirt-Introduce-support-for-disk-operation-latency-histogram-collection.patch
new file mode 100644
index 0000000..8a95bf4
--- /dev/null
+++ b/SOURCES/libvirt-Introduce-support-for-disk-operation-latency-histogram-collection.patch
@@ -0,0 +1,422 @@
+From a26ff56a6bc216751ea6995d63396dfa634407c1 Mon Sep 17 00:00:00 2001
+Message-ID: <a26ff56a6bc216751ea6995d63396dfa634407c1.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 23 Jan 2026 17:09:27 +0100
+Subject: [PATCH] Introduce support for disk operation latency histogram
+ collection
+
+Add config and docs allowing enabling latency histogram collection for
+block device operations.
+
+This patch sets up the docs, schema and XML infrastructure.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit b874c944bd8c4ffa6c51394557587c8c203f1656)
+
+https://issues.redhat.com/browse/RHEL-147866 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-131335 [rhel-10.2]
+---
+ docs/formatdomain.rst                         |  41 ++++++
+ src/conf/domain_conf.c                        | 133 +++++++++++++++++-
+ src/conf/domain_conf.h                        |   7 +
+ src/conf/schemas/domaincommon.rng             |  37 ++++-
+ ...isk-statistics-intervals.x86_64-latest.xml |  29 ++++
+ .../disk-statistics-intervals.xml             |  25 ++++
+ 6 files changed, 262 insertions(+), 10 deletions(-)
+
+diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
+index 70882c6820..31232deb3c 100644
+--- a/docs/formatdomain.rst
++++ b/docs/formatdomain.rst
+@@ -3628,6 +3628,47 @@ paravirtualized driver is specified via the ``disk`` element.
+ 
+       :since:`Since 11.9.0 (QEMU 10.2, virtio, ide, scsi disks only)`.
+ 
++      Block operation latency histogram collection can be configured using
++      ``<latency-histogram>`` sub-element. The histogram is collected for
++      the whole runtime of the VM, but can be re-started or reconfigured using
++      the `virDomainUpdateDeviceFlags <html/libvirt-libvirt-domain.html#virDomainUpdateDeviceFlags>`__
++      API. Using the same config re-starts histogram collection.
++
++      The optional ``type`` attribute configures specific operation to collect
++      the histogram for. Supported types are ``read``, ``write``, ``zone``, and
++      ``flush``. If the ``type`` attribute is omitted the histogram collection
++      bins bins apply to all of the aforementioned types, which can be overriden
++      with specific config.
++
++      The ``<latency-histogram>`` has multiple mandatory ``<bin>`` sub-elements
++      with mandatory ``start`` attribute configuring the starting boundary of
++      the histogram bin configured in nanosecods of the operation duration and
++      the intervals must be properly ordered and non-duplicate.
++
++      Example::
++
++        <driver name='qemu'>
++          <statistics>
++
++            <latency-histogram>
++              <bin start='0'/>
++              <bin start='1000'/>
++              <bin start='100000'/>
++            </latency-histogram>
++
++         [or for specific operation types]
++
++            <latency-histogram type='read'>
++              <bin start='0'/>
++              <bin start='1000'/>
++              <bin start='100000'/>
++            </latency-histogram>
++
++          </statistics>
++        </driver>
++
++      :since:`Since 12.1.0`.
++
+    -  The optional ``queues`` attribute specifies the number of virt queues for
+       virtio-blk ( :since:`Since 3.9.0` ) or vhost-user-blk
+       ( :since:`Since 7.1.0` )
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index f5c4d135a9..83c58ab5ff 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -2445,6 +2445,11 @@ virDomainDiskDefFree(virDomainDiskDef *def)
+     virObjectUnref(def->privateData);
+     g_slist_free_full(def->iothreads, (GDestroyNotify) virDomainIothreadMappingDefFree);
+     g_free(def->statistics);
++    g_free(def->histogram_boundaries);
++    g_free(def->histogram_boundaries_read);
++    g_free(def->histogram_boundaries_write);
++    g_free(def->histogram_boundaries_zone);
++    g_free(def->histogram_boundaries_flush);
+ 
+     if (def->throttlefilters) {
+         size_t i;
+@@ -8307,6 +8312,91 @@ virDomainIothreadMappingDefParse(xmlNodePtr driverNode,
+ }
+ 
+ 
++static int
++virDomainDiskDefDriverParseXMLHistogramOne(virDomainDiskDef *def,
++                                           xmlNodePtr cur)
++{
++    g_autofree char *histogram_type = NULL;
++    unsigned int **histogram_config = NULL;
++    g_autoptr(GPtrArray) binNodes = virXMLNodeGetSubelementList(cur, "bin");
++    size_t nbins = 0;
++    size_t i;
++
++    if ((histogram_type = virXMLPropString(cur, "type"))) {
++        if (STREQ(histogram_type, "read")) {
++            histogram_config = &def->histogram_boundaries_read;
++        } else if (STREQ(histogram_type, "write")) {
++            histogram_config = &def->histogram_boundaries_write;
++        } else if (STREQ(histogram_type, "zone")) {
++            histogram_config = &def->histogram_boundaries_zone;
++        } else if (STREQ(histogram_type, "flush")) {
++            histogram_config = &def->histogram_boundaries_flush;
++        } else {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                           _("unknown latency_histogram type '%1$s'"),
++                           histogram_type);
++            return -1;
++        }
++    } else {
++        histogram_config = &def->histogram_boundaries;
++    }
++
++    if (*histogram_config) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                       _("only one latency-histogram of a given type is supported"));
++        return -1;
++    }
++
++    if (binNodes->len == 0) {
++        virReportError(VIR_ERR_XML_ERROR, "%s",
++                       _("missing 'bin' elements for 'latency-histogram'"));
++        return -1;
++    }
++
++    *histogram_config = g_new0(unsigned int, binNodes->len + 1);
++
++    for (i = 0; i < binNodes->len; i++) {
++        unsigned int val;
++
++        if (virXMLPropUInt(g_ptr_array_index(binNodes, i),
++                           "start", 10,
++                           VIR_XML_PROP_REQUIRED,
++                           &val) < 0)
++            return -1;
++
++        if (nbins > 0 &&
++            (val == 0 ||
++             val <= (*histogram_config)[nbins-1])) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("the values of 'start' attribute of a 'latency-histogram' 'bin' configuration must be sorted and non-overlapping"));
++            return -1;
++        }
++
++        if (val > 0)
++            (*histogram_config)[nbins++] = val;
++    }
++
++    return 0;
++}
++
++
++static int
++virDomainDiskDefDriverParseXMLHistograms(virDomainDiskDef *def,
++                                         xmlNodePtr cur)
++{
++    g_autoptr(GPtrArray) histogramNodes = virXMLNodeGetSubelementList(cur, "latency-histogram");
++    size_t i;
++
++    for (i = 0; i < histogramNodes->len; i++) {
++        if (virDomainDiskDefDriverParseXMLHistogramOne(def,
++                                                       g_ptr_array_index(histogramNodes, i)) < 0)
++            return -1;
++    }
++
++    return 0;
++}
++
++
+ static int
+ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
+                                xmlNodePtr cur)
+@@ -8380,6 +8470,9 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
+                     return -1;
+             }
+         }
++
++        if (virDomainDiskDefDriverParseXMLHistograms(def, statisticsNode) < 0)
++            return -1;
+     }
+ 
+     if (virXMLPropEnum(cur, "detect_zeroes",
+@@ -23961,12 +24054,37 @@ virDomainDiskDefFormatThrottleFilters(virBuffer *buf,
+ }
+ 
+ 
++static void
++virDomainDiskDefFormatDriverHistogram(virBuffer *buf,
++                                      const char *type,
++                                      unsigned int *bins)
++{
++    g_auto(virBuffer) histogramAttrBuf = VIR_BUFFER_INITIALIZER;
++    g_auto(virBuffer) histogramChildBuf = VIR_BUFFER_INIT_CHILD(buf);
++
++    if (!bins || bins[0] == 0)
++        return;
++
++    if (type)
++        virBufferAsprintf(&histogramAttrBuf, " type='%s'", type);
++
++    /* we dont store the start boundary of the first bin but it's always there */
++    virBufferAddLit(&histogramChildBuf, "<bin start='0'/>\n");
++
++    for (; *bins > 0; bins++)
++        virBufferAsprintf(&histogramChildBuf, "<bin start='%u'/>\n", *bins);
++
++    virXMLFormatElement(buf, "latency-histogram", &histogramAttrBuf, &histogramChildBuf);
++}
++
++
+ static void
+ virDomainDiskDefFormatDriver(virBuffer *buf,
+                              virDomainDiskDef *disk)
+ {
+     g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
+     g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
++    g_auto(virBuffer) statisticsChildBuf = VIR_BUFFER_INIT_CHILD(&childBuf);
+ 
+     virBufferEscapeString(&attrBuf, " name='%s'", virDomainDiskGetDriver(disk));
+ 
+@@ -24038,16 +24156,25 @@ virDomainDiskDefFormatDriver(virBuffer *buf,
+     virDomainIothreadMappingDefFormat(&childBuf, disk->iothreads);
+ 
+     if (disk->statistics) {
+-        g_auto(virBuffer) statisticsChildBuf = VIR_BUFFER_INIT_CHILD(&childBuf);
+         size_t i;
+ 
+         for (i = 0; disk->statistics[i] > 0; i++)
+             virBufferAsprintf(&statisticsChildBuf, "<statistic interval='%u'/>\n",
+                               disk->statistics[i]);
+-
+-        virXMLFormatElement(&childBuf, "statistics", NULL, &statisticsChildBuf);
+     }
+ 
++    virDomainDiskDefFormatDriverHistogram(&statisticsChildBuf, NULL,
++                                          disk->histogram_boundaries);
++    virDomainDiskDefFormatDriverHistogram(&statisticsChildBuf, "read",
++                                          disk->histogram_boundaries_read);
++    virDomainDiskDefFormatDriverHistogram(&statisticsChildBuf, "write",
++                                          disk->histogram_boundaries_write);
++    virDomainDiskDefFormatDriverHistogram(&statisticsChildBuf, "zone",
++                                          disk->histogram_boundaries_zone);
++    virDomainDiskDefFormatDriverHistogram(&statisticsChildBuf, "flush",
++                                          disk->histogram_boundaries_flush);
++
++    virXMLFormatElement(&childBuf, "statistics", NULL, &statisticsChildBuf);
+ 
+     virXMLFormatElement(buf, "driver", &attrBuf, &childBuf);
+ }
+diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
+index 8f53ed96c0..b120d4a68e 100644
+--- a/src/conf/domain_conf.h
++++ b/src/conf/domain_conf.h
+@@ -596,6 +596,13 @@ struct _virDomainDiskDef {
+     GSList *iothreads; /* List of virDomainIothreadMappingDef */
+     unsigned int *statistics; /* Optional, zero terminated list of intervals to
+                                 collect statistics for */
++    /* optional zero terminated lists of bin boundaries for latency histograms */
++    unsigned int *histogram_boundaries;
++    unsigned int *histogram_boundaries_read;
++    unsigned int *histogram_boundaries_write;
++    unsigned int *histogram_boundaries_zone;
++    unsigned int *histogram_boundaries_flush;
++
+     virDomainDiskDetectZeroes detect_zeroes;
+     virTristateSwitch discard_no_unref;
+     char *domain_name; /* backend domain name */
+diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
+index 1f9ac102a0..441328a08e 100644
+--- a/src/conf/schemas/domaincommon.rng
++++ b/src/conf/schemas/domaincommon.rng
+@@ -2728,13 +2728,36 @@
+         </optional>
+         <optional>
+           <element name="statistics">
+-            <zeroOrMore>
+-              <element name="statistic">
+-                <attribute name="interval">
+-                  <ref name="unsignedInt"/>
+-                </attribute>
+-              </element>
+-            </zeroOrMore>
++            <interleave>
++              <zeroOrMore>
++                <element name="statistic">
++                  <attribute name="interval">
++                    <ref name="unsignedInt"/>
++                  </attribute>
++                </element>
++              </zeroOrMore>
++              <zeroOrMore>
++                <element name="latency-histogram">
++                  <optional>
++                    <attribute name='type'>
++                      <choice>
++                        <value>read</value>
++                        <value>write</value>
++                        <value>zone</value>
++                        <value>flush</value>
++                      </choice>
++                    </attribute>
++                  </optional>
++                  <oneOrMore>
++                    <element name='bin'>
++                      <attribute name='start'>
++                        <ref name="unsignedInt"/>
++                      </attribute>
++                    </element>
++                  </oneOrMore>
++                </element>
++              </zeroOrMore>
++            </interleave>
+           </element>
+         </optional>
+       </interleave>
+diff --git a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.xml
+index 4c55c50ef5..d02f954073 100644
+--- a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.xml
++++ b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.xml
+@@ -22,6 +22,11 @@
+         <statistics>
+           <statistic interval='3'/>
+           <statistic interval='10'/>
++          <latency-histogram>
++            <bin start='0'/>
++            <bin start='20'/>
++            <bin start='30'/>
++          </latency-histogram>
+         </statistics>
+       </driver>
+       <source file='/var/lib/libvirt/images/iothrtest1.img'/>
+@@ -33,6 +38,30 @@
+         <statistics>
+           <statistic interval='5'/>
+           <statistic interval='15'/>
++          <latency-histogram type='read'>
++            <bin start='0'/>
++            <bin start='10'/>
++            <bin start='20'/>
++            <bin start='30'/>
++          </latency-histogram>
++          <latency-histogram type='write'>
++            <bin start='0'/>
++            <bin start='10'/>
++            <bin start='20'/>
++            <bin start='30'/>
++          </latency-histogram>
++          <latency-histogram type='zone'>
++            <bin start='0'/>
++            <bin start='10'/>
++            <bin start='20'/>
++            <bin start='30'/>
++          </latency-histogram>
++          <latency-histogram type='flush'>
++            <bin start='0'/>
++            <bin start='10'/>
++            <bin start='20'/>
++            <bin start='30'/>
++          </latency-histogram>
+         </statistics>
+       </driver>
+       <source file='/var/lib/libvirt/images/iothrtest2.img'/>
+diff --git a/tests/qemuxmlconfdata/disk-statistics-intervals.xml b/tests/qemuxmlconfdata/disk-statistics-intervals.xml
+index f5e801f5a8..5f9e9470d7 100644
+--- a/tests/qemuxmlconfdata/disk-statistics-intervals.xml
++++ b/tests/qemuxmlconfdata/disk-statistics-intervals.xml
+@@ -19,6 +19,11 @@
+         <statistics>
+           <statistic interval='3'/>
+           <statistic interval='10'/>
++          <latency-histogram>
++            <bin start='0'/>
++            <bin start='20'/>
++            <bin start='30'/>
++          </latency-histogram>
+         </statistics>
+       </driver>
+       <source file='/var/lib/libvirt/images/iothrtest1.img'/>
+@@ -29,6 +34,26 @@
+         <statistics>
+           <statistic interval='5'/>
+           <statistic interval='15'/>
++          <latency-histogram type='read'>
++            <bin start='10'/>
++            <bin start='20'/>
++            <bin start='30'/>
++          </latency-histogram>
++          <latency-histogram type='write'>
++            <bin start='10'/>
++            <bin start='20'/>
++            <bin start='30'/>
++          </latency-histogram>
++          <latency-histogram type='zone'>
++            <bin start='10'/>
++            <bin start='20'/>
++            <bin start='30'/>
++          </latency-histogram>
++          <latency-histogram type='flush'>
++            <bin start='10'/>
++            <bin start='20'/>
++            <bin start='30'/>
++          </latency-histogram>
+         </statistics>
+       </driver>
+       <source file='/var/lib/libvirt/images/iothrtest2.img'/>
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-RHEL-ONLY-backport-test-data-for-migrate-pr-capability-of-scsi-block.patch b/SOURCES/libvirt-RHEL-ONLY-backport-test-data-for-migrate-pr-capability-of-scsi-block.patch
new file mode 100644
index 0000000..6f8b0dc
--- /dev/null
+++ b/SOURCES/libvirt-RHEL-ONLY-backport-test-data-for-migrate-pr-capability-of-scsi-block.patch
@@ -0,0 +1,125 @@
+From 91aa454341b6cf9a901405b8e12d4c15a233e05a Mon Sep 17 00:00:00 2001
+Message-ID: <91aa454341b6cf9a901405b8e12d4c15a233e05a.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Feb 2026 15:08:54 +0100
+Subject: [PATCH] RHEL-ONLY: backport test data for 'migrate-pr' capability of
+ 'scsi-block'
+
+In upstream qemu the capability is present starting with qemu-11.0. We
+don't have the test data downstream and backporting them would be too
+invasive. Backport the relevant capability detection as a
+downstream-only fix.
+
+https://issues.redhat.com/browse/RHEL-140614 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-135115 [rhel-10.2]
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+---
+ .../caps_10.2.0_x86_64.replies                | 79 ++++++++++++++++++-
+ .../caps_10.2.0_x86_64.xml                    |  1 +
+ 2 files changed, 76 insertions(+), 4 deletions(-)
+
+diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies
+index cb4abb4533..10db9baca1 100644
+--- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies
+@@ -33081,10 +33081,81 @@
+ }
+ 
+ {
+-  "error": {
+-    "class": "DeviceNotFound",
+-    "desc": "The libvirt device dump was not collected for this version+device tuple"
+-  },
++  "return": [
++    {
++      "default-value": 4294967295,
++      "name": "scsi-id",
++      "type": "uint32"
++    },
++    {
++      "default-value": 4294967295,
++      "name": "lun",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "channel",
++      "type": "uint32"
++    },
++    {
++      "default-value": "auto",
++      "name": "rerror",
++      "description": "Error handling policy (report/ignore/enospc/stop/auto)",
++      "type": "BlockdevOnError"
++    },
++    {
++      "default-value": 2147483647,
++      "name": "max_io_size",
++      "type": "uint64"
++    },
++    {
++      "default-value": false,
++      "name": "share-rw",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "migrate-pr",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": "auto",
++      "name": "werror",
++      "description": "Error handling policy (report/ignore/enospc/stop/auto)",
++      "type": "BlockdevOnError"
++    },
++    {
++      "default-value": 1073741824,
++      "name": "max_unmap_size",
++      "type": "uint64"
++    },
++    {
++      "default-value": -1,
++      "name": "scsi_version",
++      "type": "int32"
++    },
++    {
++      "default-value": 0,
++      "name": "rotation_rate",
++      "type": "uint16"
++    },
++    {
++      "name": "drive",
++      "description": "Node name or ID of a block device to use as a backend",
++      "type": "str"
++    },
++    {
++      "default-value": 30,
++      "name": "io_timeout",
++      "type": "uint32"
++    },
++    {
++      "name": "bootindex",
++      "type": "int32"
++    }
++  ],
+   "id": "libvirt-37"
+ }
+ 
+diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
+index 7cff2c2291..7d5a75ce88 100644
+--- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
+@@ -215,6 +215,7 @@
+   <flag name='acpi-generic-initiator'/>
+   <flag name='disk-timed-stats'/>
+   <flag name='query-accelerators'/>
++  <flag name='scsi-block.migrate-pr'/>
+   <version>10001091</version>
+   <microcodeVersion>43100287</microcodeVersion>
+   <package>v10.2.0-rc1-38-gfb241d0a1f</package>
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-build-Bump-minimum-glib2-version-to-2.66.0.patch b/SOURCES/libvirt-build-Bump-minimum-glib2-version-to-2.66.0.patch
deleted file mode 100644
index d1f76c1..0000000
--- a/SOURCES/libvirt-build-Bump-minimum-glib2-version-to-2.66.0.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-From 5e88ca84d3988e7943cace7b53cd1a249c55a99b Mon Sep 17 00:00:00 2001
-Message-ID: <5e88ca84d3988e7943cace7b53cd1a249c55a99b.1738940190.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 27 Jan 2025 17:42:34 +0100
-Subject: [PATCH] build: Bump minimum glib2 version to 2.66.0
-
-Per our supported platforms the minimum available versions are:
-
-         CentOS Stream 9: 2.68.4
-               Debian 11: 2.66.8
-               Fedora 39: 2.78.6
-      openSUSE Leap 15.6: 2.78.6
-            Ubuntu 22.04: 2.72.4
-           FreeBSD ports: 2.80.5
-          macOS homebrew: 2.82.4
-          macOS macports: 2.78.4
-
-Bump to 2.66 which is limited by Debian 11. While ideally we'd bump to
-2.68 which would give us 'g_strv_builder' and friends 2.66 is enough for
-g_ptr_array_steal() which can be used to emulate the former with almost
-no extra code.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 420c39d6bd66ccf4841878882f5a3e9e47103ebb)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- libvirt.spec.in          |  2 +-
- meson.build              |  2 +-
- src/libvirt_private.syms |  4 --
- src/qemu/qemu_agent.c    |  2 +-
- src/qemu/qemu_monitor.c  |  2 +-
- src/util/glibcompat.c    | 94 ----------------------------------------
- src/util/glibcompat.h    | 18 --------
- src/util/vireventglib.c  | 12 ++---
- 8 files changed, 10 insertions(+), 126 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 89ac1594cb..d3e2c939ea 100644
---- a/meson.build
-+++ b/meson.build
-@@ -998,7 +998,7 @@ else
-   endif
- endif
- 
--glib_version = '2.58.0'
-+glib_version = '2.66.0'
- glib_dep = dependency('glib-2.0', version: '>=' + glib_version)
- gobject_dep = dependency('gobject-2.0', version: '>=' + glib_version)
- if host_machine.system() == 'windows'
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index c931003fad..43e2dfb9cd 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1871,10 +1871,6 @@ virStorageSourceUpdatePhysicalSize;
- 
- 
- # util/glibcompat.h
--vir_g_fsync;
--vir_g_source_unref;
--vir_g_strdup_printf;
--vir_g_strdup_vprintf;
- vir_g_string_replace;
- 
- 
-diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
-index 22359f8518..43fca86f10 100644
---- a/src/qemu/qemu_agent.c
-+++ b/src/qemu/qemu_agent.c
-@@ -448,7 +448,7 @@ qemuAgentUnregister(qemuAgent *agent)
- {
-     if (agent->watch) {
-         g_source_destroy(agent->watch);
--        vir_g_source_unref(agent->watch, agent->context);
-+        g_source_unref(agent->watch);
-         agent->watch = NULL;
-     }
- }
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 73f37d26eb..79bd91b539 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -745,7 +745,7 @@ qemuMonitorUnregister(qemuMonitor *mon)
- {
-     if (mon->watch) {
-         g_source_destroy(mon->watch);
--        vir_g_source_unref(mon->watch, mon->context);
-+        g_source_unref(mon->watch);
-         mon->watch = NULL;
-     }
- }
-diff --git a/src/util/glibcompat.c b/src/util/glibcompat.c
-index 98dcfab389..bcb666992a 100644
---- a/src/util/glibcompat.c
-+++ b/src/util/glibcompat.c
-@@ -63,100 +63,6 @@
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- 
--#undef g_fsync
--#undef g_strdup_printf
--#undef g_strdup_vprintf
--
--
--/* Drop when min glib >= 2.63.0 */
--gint
--vir_g_fsync(gint fd)
--{
--#ifdef G_OS_WIN32
--    return _commit(fd);
--#else
--    return fsync(fd);
--#endif
--}
--
--
--/* Due to a bug in glib, g_strdup_printf() nor g_strdup_vprintf()
-- * abort on OOM.  It's fixed in glib's upstream. Provide our own
-- * implementation until the fix gets distributed. */
--char *
--vir_g_strdup_printf(const char *msg, ...)
--{
--    va_list args;
--    char *ret;
--    va_start(args, msg);
--    ret = g_strdup_vprintf(msg, args);
--    if (!ret)
--        abort();
--    va_end(args);
--    return ret;
--}
--
--
--char *
--vir_g_strdup_vprintf(const char *msg, va_list args)
--{
--    char *ret;
--    ret = g_strdup_vprintf(msg, args);
--    if (!ret)
--        abort();
--    return ret;
--}
--
--
--/*
-- * If the last reference to a GSource is released in a non-main
-- * thread we're exposed to a race condition that causes a
-- * crash:
-- *
-- *    https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1358
-- *
-- * Thus we're using an idle func to release our ref...
-- *
-- * ...but this imposes a significant performance penalty on
-- * I/O intensive workloads which are sensitive to the iterations
-- * of the event loop, so avoid the workaround if we know we have
-- * new enough glib.
-- *
-- * The function below is used from a header file definition.
-- *
-- * Drop when min glib >= 2.64.0
-- */
--#if GLIB_CHECK_VERSION(2, 64, 0)
--void vir_g_source_unref(GSource *src, GMainContext *ctx G_GNUC_UNUSED)
--{
--    g_source_unref(src);
--}
--#else
--
--static gboolean
--virEventGLibSourceUnrefIdle(gpointer data)
--{
--    GSource *src = data;
--
--    g_source_unref(src);
--
--    return FALSE;
--}
--
--void vir_g_source_unref(GSource *src, GMainContext *ctx)
--{
--    GSource *idle = g_idle_source_new();
--
--    g_source_set_callback(idle, virEventGLibSourceUnrefIdle, src, NULL);
--
--    g_source_attach(idle, ctx);
--
--    g_source_unref(idle);
--}
--
--#endif
--
--
- /**
-  * Adapted (to pass syntax check) from 'g_string_replace' from
-  * glib-2.81.1. Drop once minimum glib is bumped to 2.68.
-diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h
-index 474ff95bc5..a3d01089e6 100644
---- a/src/util/glibcompat.h
-+++ b/src/util/glibcompat.h
-@@ -42,24 +42,6 @@
- 
- #endif /* GLib < 2.67.0 */
- 
--
--gint vir_g_fsync(gint fd);
--char *vir_g_strdup_printf(const char *msg, ...)
--    G_GNUC_PRINTF(1, 2);
--char *vir_g_strdup_vprintf(const char *msg, va_list args)
--    G_GNUC_PRINTF(1, 0);
--
--#if !GLIB_CHECK_VERSION(2, 64, 0)
--# define g_strdup_printf vir_g_strdup_printf
--# define g_strdup_vprintf vir_g_strdup_vprintf
--#endif
--
--#undef g_fsync
--#define g_fsync vir_g_fsync
--
--void vir_g_source_unref(GSource *src, GMainContext *ctx);
--
--
- /* Drop once we require glib-2.68 at minimum */
- guint
- vir_g_string_replace(GString *string,
-diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c
-index 023dc37445..6c54f62123 100644
---- a/src/util/vireventglib.c
-+++ b/src/util/vireventglib.c
-@@ -213,7 +213,7 @@ virEventGLibHandleUpdate(int watch,
-         if (data->source != NULL) {
-             VIR_DEBUG("Removed old handle source=%p", data->source);
-             g_source_destroy(data->source);
--            vir_g_source_unref(data->source, NULL);
-+            g_source_unref(data->source);
-         }
- 
-         data->source = virEventGLibAddSocketWatch(
-@@ -227,7 +227,7 @@ virEventGLibHandleUpdate(int watch,
- 
-         VIR_DEBUG("Removed old handle source=%p", data->source);
-         g_source_destroy(data->source);
--        vir_g_source_unref(data->source, NULL);
-+        g_source_unref(data->source);
-         data->source = NULL;
-         data->events = 0;
-     }
-@@ -276,7 +276,7 @@ virEventGLibHandleRemove(int watch)
- 
-     if (data->source != NULL) {
-         g_source_destroy(data->source);
--        vir_g_source_unref(data->source, NULL);
-+        g_source_unref(data->source);
-         data->source = NULL;
-         data->events = 0;
-     }
-@@ -409,7 +409,7 @@ virEventGLibTimeoutUpdate(int timer,
-     if (interval >= 0) {
-         if (data->source != NULL) {
-             g_source_destroy(data->source);
--            vir_g_source_unref(data->source, NULL);
-+            g_source_unref(data->source);
-         }
- 
-         data->interval = interval;
-@@ -419,7 +419,7 @@ virEventGLibTimeoutUpdate(int timer,
-             goto cleanup;
- 
-         g_source_destroy(data->source);
--        vir_g_source_unref(data->source, NULL);
-+        g_source_unref(data->source);
-         data->source = NULL;
-     }
- 
-@@ -468,7 +468,7 @@ virEventGLibTimeoutRemove(int timer)
- 
-     if (data->source != NULL) {
-         g_source_destroy(data->source);
--        vir_g_source_unref(data->source, NULL);
-+        g_source_unref(data->source);
-         data->source = NULL;
-     }
- 
--- 
-2.48.1
diff --git a/SOURCES/libvirt-conf-Adjust-hyperv-tlbflush-formatting.patch b/SOURCES/libvirt-conf-Adjust-hyperv-tlbflush-formatting.patch
deleted file mode 100644
index e2fc32d..0000000
--- a/SOURCES/libvirt-conf-Adjust-hyperv-tlbflush-formatting.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From e34ac564b018b166a7d6f955f2abe80a9e62f07e Mon Sep 17 00:00:00 2001
-Message-ID: <e34ac564b018b166a7d6f955f2abe80a9e62f07e.1737030652.git.jdenemar@redhat.com>
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Mon, 6 Jan 2025 16:11:01 +0100
-Subject: [PATCH] conf: Adjust hyperv tlbflush formatting
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 247357cc292a added support for direct and extended modes for
-tlbflush, but forgot to do the formatting as well.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-(cherry picked from commit 9df14f51735eeb4221a25ccd408a2dccf0a35b59)
-
-https://issues.redhat.com/browse/RHEL-7122
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
----
- src/conf/domain_conf.c                         | 11 ++++++++++-
- tests/qemuxmlconfdata/hyperv.x86_64-latest.xml |  5 ++++-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index c8254d2146..1f0b67ca28 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -27974,7 +27974,6 @@ virDomainDefFormatFeatures(virBuffer *buf,
-                 case VIR_DOMAIN_HYPERV_RESET:
-                 case VIR_DOMAIN_HYPERV_FREQUENCIES:
-                 case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
--                case VIR_DOMAIN_HYPERV_TLBFLUSH:
-                 case VIR_DOMAIN_HYPERV_IPI:
-                 case VIR_DOMAIN_HYPERV_EVMCS:
-                 case VIR_DOMAIN_HYPERV_AVIC:
-@@ -28004,6 +28003,16 @@ virDomainDefFormatFeatures(virBuffer *buf,
-                     }
-                     break;
- 
-+                case VIR_DOMAIN_HYPERV_TLBFLUSH:
-+                    if (def->hyperv_features[j] != VIR_TRISTATE_SWITCH_ON)
-+                        break;
-+
-+                    if (def->hyperv_tlbflush_direct == VIR_TRISTATE_SWITCH_ON)
-+                        virBufferAddLit(&hypervChildBuf, "<direct state='on'/>\n");
-+                    if (def->hyperv_tlbflush_extended == VIR_TRISTATE_SWITCH_ON)
-+                        virBufferAddLit(&hypervChildBuf, "<extended state='on'/>\n");
-+                    break;
-+
-                 case VIR_DOMAIN_HYPERV_LAST:
-                     break;
-                 }
-diff --git a/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml b/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml
-index 36d9161fa8..49537188af 100644
---- a/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml
-+++ b/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml
-@@ -22,7 +22,10 @@
-       <vendor_id state='on' value='KVM Hv'/>
-       <frequencies state='on'/>
-       <reenlightenment state='on'/>
--      <tlbflush state='on'/>
-+      <tlbflush state='on'>
-+        <direct state='on'/>
-+        <extended state='on'/>
-+      </tlbflush>
-       <ipi state='on'/>
-       <evmcs state='on'/>
-       <avic state='on'/>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-conf-Introduce-iommufd-enum-for-domaincaps.patch b/SOURCES/libvirt-conf-Introduce-iommufd-enum-for-domaincaps.patch
new file mode 100644
index 0000000..99ef8a7
--- /dev/null
+++ b/SOURCES/libvirt-conf-Introduce-iommufd-enum-for-domaincaps.patch
@@ -0,0 +1,69 @@
+From 18aa061f3b4f2b2c2ed6f07120a990935f56d93e Mon Sep 17 00:00:00 2001
+Message-ID: <18aa061f3b4f2b2c2ed6f07120a990935f56d93e.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sat, 14 Feb 2026 06:14:20 +0100
+Subject: [PATCH] conf: Introduce iommufd enum for domaincaps
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 855f8fe9e2454555ba84696750e0e1501dd5ba80)
+
+Resolves: https://issues.redhat.com/browse/RHEL-138544
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ docs/formatdomaincaps.rst      | 7 +++++++
+ src/conf/domain_capabilities.c | 1 +
+ src/conf/domain_capabilities.h | 1 +
+ 3 files changed, 9 insertions(+)
+
+diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst
+index 8b4f0ecff3..6ba7f84f96 100644
+--- a/docs/formatdomaincaps.rst
++++ b/docs/formatdomaincaps.rst
+@@ -461,6 +461,10 @@ Well, only if the following is enabled:
+            <value>vfio</value>
+            <value>xen</value>
+          </enum>
++         <enum name='iommufd'>
++           <value>yes</value>
++           <value>no</value>
++         </enum>
+        </hostdev>
+      </devices>
+    </domainCapabilities>
+@@ -477,6 +481,9 @@ Well, only if the following is enabled:
+    ``mode="capabilities"``.
+ ``pciBackend``
+    Options for the ``name`` attribute of the <driver/> element.
++``iommufd``
++   Options for the ``iommufd`` attribute of the <driver/> element.
++   :since:`Since 12.1.0`
+ 
+ RNG device
+ ^^^^^^^^^^
+diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
+index f843124695..49179b97ab 100644
+--- a/src/conf/domain_capabilities.c
++++ b/src/conf/domain_capabilities.c
+@@ -620,6 +620,7 @@ virDomainCapsDeviceHostdevFormat(virBuffer *buf,
+     ENUM_PROCESS(hostdev, subsysType, virDomainHostdevSubsysTypeToString);
+     ENUM_PROCESS(hostdev, capsType, virDomainHostdevCapsTypeToString);
+     ENUM_PROCESS(hostdev, pciBackend, virDeviceHostdevPCIDriverNameTypeToString);
++    ENUM_PROCESS(hostdev, iommufd, virTristateBoolTypeToString);
+ 
+     FORMAT_EPILOGUE(hostdev);
+ }
+diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
+index 437981c711..b10370db8f 100644
+--- a/src/conf/domain_capabilities.h
++++ b/src/conf/domain_capabilities.h
+@@ -108,6 +108,7 @@ struct _virDomainCapsDeviceHostdev {
+     virDomainCapsEnum subsysType;       /* Info about virDomainHostdevSubsysType */
+     virDomainCapsEnum capsType;         /* Info about virDomainHostdevCapsType */
+     virDomainCapsEnum pciBackend;       /* Info about virDomainHostdevSubsysPCIBackendType */
++    virDomainCapsEnum iommufd;          /* Info about iommufd:virTristateBool */
+     /* add new fields here */
+ };
+ 
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-conf-Introduce-virDomainDefHasPCIHostdevWithIOMMUFD.patch b/SOURCES/libvirt-conf-Introduce-virDomainDefHasPCIHostdevWithIOMMUFD.patch
new file mode 100644
index 0000000..6969f7b
--- /dev/null
+++ b/SOURCES/libvirt-conf-Introduce-virDomainDefHasPCIHostdevWithIOMMUFD.patch
@@ -0,0 +1,132 @@
+From 748c9648eb88b69e3ed0847126d59d6c7a11eda8 Mon Sep 17 00:00:00 2001
+Message-ID: <748c9648eb88b69e3ed0847126d59d6c7a11eda8.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 18:19:56 +0100
+Subject: [PATCH] conf: Introduce virDomainDefHasPCIHostdevWithIOMMUFD
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 4b176cfc3877cca882d63ab4ed446794d7a05722)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/conf/domain_conf.c   | 14 ++++++++++++++
+ src/conf/domain_conf.h   |  3 +++
+ src/libvirt_private.syms |  1 +
+ src/qemu/qemu_command.c  | 42 ++++++++++++----------------------------
+ 4 files changed, 30 insertions(+), 30 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 9ae48e9abc..cb047e5a3e 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -32482,6 +32482,20 @@ virDomainDefHasPCIHostdev(const virDomainDef *def)
+ }
+ 
+ 
++bool
++virDomainDefHasPCIHostdevWithIOMMUFD(const virDomainDef *def)
++{
++    size_t i;
++
++    for (i = 0; i < def->nhostdevs; i++) {
++        if (virHostdevIsPCIDeviceWithIOMMUFD(def->hostdevs[i]))
++            return true;
++    }
++
++    return false;
++}
++
++
+ bool
+ virDomainDefHasMdevHostdev(const virDomainDef *def)
+ {
+diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
+index d958ed04f9..69a8e79c6d 100644
+--- a/src/conf/domain_conf.h
++++ b/src/conf/domain_conf.h
+@@ -4655,6 +4655,9 @@ virDomainDefHasNVMeDisk(const virDomainDef *def);
+ bool
+ virDomainDefHasPCIHostdev(const virDomainDef *def);
+ 
++bool
++virDomainDefHasPCIHostdevWithIOMMUFD(const virDomainDef *def);
++
+ bool
+ virDomainDefHasMdevHostdev(const virDomainDef *def);
+ 
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index 863e50ec4f..effe44fe57 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -348,6 +348,7 @@ virDomainDefHasNVMeDisk;
+ virDomainDefHasOldStyleROUEFI;
+ virDomainDefHasOldStyleUEFI;
+ virDomainDefHasPCIHostdev;
++virDomainDefHasPCIHostdevWithIOMMUFD;
+ virDomainDefHasTimer;
+ virDomainDefHasUSB;
+ virDomainDefHasVcpusOffline;
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 1718097b63..482f8d8ca2 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -5349,43 +5349,25 @@ qemuBuildIOMMUFDCommandLine(virCommand *cmd,
+                             const virDomainDef *def,
+                             virDomainObj *vm)
+ {
+-    size_t i;
+     qemuDomainObjPrivate *priv = vm->privateData;
+     g_autofree char *fdstr = g_strdup_printf("%d", priv->iommufd);
++    g_autoptr(virJSONValue) props = NULL;
+ 
++    if (!virDomainDefHasPCIHostdevWithIOMMUFD(def))
++        return 0;
+ 
+-    for (i = 0; i < def->nhostdevs; i++) {
+-        virDomainHostdevDef *hostdev = def->hostdevs[i];
+-        virDomainHostdevSubsys *subsys = &hostdev->source.subsys;
+-        g_autoptr(virJSONValue) props = NULL;
++    virCommandPassFD(cmd, priv->iommufd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
+ 
+-        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
+-            continue;
++    priv->iommufd = -1;
+ 
+-        if (subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
+-            continue;
++    if (qemuMonitorCreateObjectProps(&props, "iommufd",
++                                     "iommufd0",
++                                     "S:fd", fdstr,
++                                     NULL) < 0)
++        return -1;
+ 
+-        if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED)
+-            continue;
+-
+-        if (subsys->u.pci.driver.iommufd != VIR_TRISTATE_BOOL_YES)
+-            continue;
+-
+-        virCommandPassFD(cmd, priv->iommufd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
+-
+-        priv->iommufd = -1;
+-
+-        if (qemuMonitorCreateObjectProps(&props, "iommufd",
+-                                         "iommufd0",
+-                                         "S:fd", fdstr,
+-                                         NULL) < 0)
+-            return -1;
+-
+-        if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0)
+-            return -1;
+-
+-        break;
+-    }
++    if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0)
++        return -1;
+ 
+     return 0;
+ }
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-conf-Introduce-virHostdevIsPCIDeviceWithIOMMUFD.patch b/SOURCES/libvirt-conf-Introduce-virHostdevIsPCIDeviceWithIOMMUFD.patch
new file mode 100644
index 0000000..615615d
--- /dev/null
+++ b/SOURCES/libvirt-conf-Introduce-virHostdevIsPCIDeviceWithIOMMUFD.patch
@@ -0,0 +1,89 @@
+From 3864161a4d28f0ef71d435f2ae1e52e92afaac15 Mon Sep 17 00:00:00 2001
+Message-ID: <3864161a4d28f0ef71d435f2ae1e52e92afaac15.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 18:19:23 +0100
+Subject: [PATCH] conf: Introduce virHostdevIsPCIDeviceWithIOMMUFD
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 97eed30948e980be8b7552fff637e828768854e4)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/conf/domain_conf.c   | 15 +++++++++++++++
+ src/conf/domain_conf.h   |  3 +++
+ src/libvirt_private.syms |  1 +
+ src/qemu/qemu_process.c  |  5 +----
+ 4 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 83c58ab5ff..9ae48e9abc 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -32758,6 +32758,21 @@ virHostdevIsPCIDevice(const virDomainHostdevDef *hostdev)
+ }
+ 
+ 
++/**
++ * virHostdevIsPCIDeviceWithIOMMUFD:
++ * @hostdev: host device to check
++ *
++ * Returns true if @hostdev is a PCI device with IOMMUFD enabled, false otherwise.
++ */
++bool
++virHostdevIsPCIDeviceWithIOMMUFD(const virDomainHostdevDef *hostdev)
++{
++    return virHostdevIsPCIDevice(hostdev) &&
++        hostdev->source.subsys.u.pci.driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO &&
++        hostdev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES;
++}
++
++
+ static void
+ virDomainObjGetMessagesIOErrorsSrc(virStorageSource *src,
+                                    const char *diskdst,
+diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
+index b120d4a68e..d958ed04f9 100644
+--- a/src/conf/domain_conf.h
++++ b/src/conf/domain_conf.h
+@@ -4713,6 +4713,9 @@ virHostdevIsMdevDevice(const virDomainHostdevDef *hostdev)
+ bool
+ virHostdevIsPCIDevice(const virDomainHostdevDef *hostdev)
+     ATTRIBUTE_NONNULL(1);
++bool
++virHostdevIsPCIDeviceWithIOMMUFD(const virDomainHostdevDef *hostdev)
++    ATTRIBUTE_NONNULL(1);
+ 
+ void
+ virDomainObjGetMessagesIOErrorsChain(virStorageSource *src,
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index 9ae44e31b8..863e50ec4f 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -812,6 +812,7 @@ virDomainQemuMonitorEventNew;
+ virDomainQemuMonitorEventStateRegisterID;
+ virHostdevIsMdevDevice;
+ virHostdevIsPCIDevice;
++virHostdevIsPCIDeviceWithIOMMUFD;
+ virHostdevIsSCSIDevice;
+ 
+ 
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 7e32325fa0..3bd81c55b3 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7732,10 +7732,7 @@ qemuProcessOpenVfioFds(virDomainObj *vm)
+     for (i = 0; i < vm->def->nhostdevs; i++) {
+         virDomainHostdevDef *hostdev = vm->def->hostdevs[i];
+ 
+-        if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
+-            hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
+-            hostdev->source.subsys.u.pci.driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO &&
+-            hostdev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES) {
++        if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) {
+             /* Open VFIO device FD */
+             if (qemuProcessOpenVfioDeviceFd(hostdev) < 0)
+                 return -1;
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-conf-add-deprecated_features-attribute.patch b/SOURCES/libvirt-conf-add-deprecated_features-attribute.patch
deleted file mode 100644
index 11fdd08..0000000
--- a/SOURCES/libvirt-conf-add-deprecated_features-attribute.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-From 4c66a653f02c8259fdcf72fdcd801b594f73183e Mon Sep 17 00:00:00 2001
-Message-ID: <4c66a653f02c8259fdcf72fdcd801b594f73183e.1749039441.git.jdenemar@redhat.com>
-From: Collin Walling <walling@linux.ibm.com>
-Date: Mon, 16 Dec 2024 18:03:58 -0500
-Subject: [PATCH] conf: add deprecated_features attribute
-
-Add a new a attribute, deprecated_features='on|off' to the <cpu>
-element.  This is used to toggle features flagged as deprecated on the
-CPU model on or off.  When this attribute is paired with 'on',
-deprecated features will not be filtered.  When paired with 'off', any
-CPU features that are flagged as deprecated will be listed under the
-CPU model with the 'disable' policy.
-
-Example:
-
-  <cpu mode='host-model' check='partial' deprecated_features='off'/>
-
-The absence of this attribute is equivalent to the 'on' option.
-
-The deprecated features that will populate the domain XML are the same
-features that result in the virsh domcapabilities command with the
---disable-deprecated-features argument present.
-
-It is recommended to define a domain XML with this attribute set to
-'off' to ensure migration to machines that may outright drop these
-features in the future.
-
-Signed-off-by: Collin Walling <walling@linux.ibm.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 62658bbf060784c757f96c9de3935f27885834aa)
-JIRA: https://issues.redhat.com/browse/RHEL-89415
-Signed-off-by: Thomas Huth <thuth@redhat.com>
----
- src/conf/cpu_conf.c                           | 11 +++++++
- src/conf/cpu_conf.h                           |  1 +
- src/conf/schemas/cputypes.rng                 |  5 +++
- src/qemu/qemu_process.c                       | 11 +++++++
- ...el-deprecated-features-off.s390x-8.2.0.err |  1 +
- ...el-deprecated-features-off.s390x-8.2.0.xml | 25 +++++++++++++++
- ...-deprecated-features-off.s390x-latest.args | 32 +++++++++++++++++++
- ...l-deprecated-features-off.s390x-latest.xml | 25 +++++++++++++++
- .../cpu-model-deprecated-features-off.xml     | 15 +++++++++
- tests/qemuxmlconftest.c                       |  3 ++
- 10 files changed, 129 insertions(+)
- create mode 100644 tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-8.2.0.err
- create mode 100644 tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-8.2.0.xml
- create mode 100644 tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.args
- create mode 100644 tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.xml
- create mode 100644 tests/qemuxmlconfdata/cpu-model-deprecated-features-off.xml
-
-diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
-index dcc164d165..31425783ba 100644
---- a/src/conf/cpu_conf.c
-+++ b/src/conf/cpu_conf.c
-@@ -238,6 +238,7 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu)
-     copy->mode = cpu->mode;
-     copy->match = cpu->match;
-     copy->check = cpu->check;
-+    copy->deprecated_feats = cpu->deprecated_feats;
-     copy->fallback = cpu->fallback;
-     copy->sockets = cpu->sockets;
-     copy->dies = cpu->dies;
-@@ -450,6 +451,11 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
-         if (virXMLPropEnum(ctxt->node, "check", virCPUCheckTypeFromString,
-                            VIR_XML_PROP_NONE, &def->check) < 0)
-             return -1;
-+
-+        if (virXMLPropTristateSwitch(ctxt->node, "deprecated_features",
-+                                     VIR_XML_PROP_NONE,
-+                                     &def->deprecated_feats) < 0)
-+            return -1;
-     }
- 
-     if (def->type == VIR_CPU_TYPE_HOST) {
-@@ -748,6 +754,11 @@ virCPUDefFormatBufFull(virBuffer *buf,
-             virBufferAsprintf(&attributeBuf, " migratable='%s'",
-                               virTristateSwitchTypeToString(def->migratable));
-         }
-+
-+        if (def->deprecated_feats) {
-+            virBufferAsprintf(&attributeBuf, " deprecated_features='%s'",
-+                              virTristateSwitchTypeToString(def->deprecated_feats));
-+        }
-     }
- 
-     /* Format children */
-diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
-index f71d942ce6..28e26303ef 100644
---- a/src/conf/cpu_conf.h
-+++ b/src/conf/cpu_conf.h
-@@ -161,6 +161,7 @@ struct _virCPUDef {
-     virCPUMaxPhysAddrDef *addr;
-     virHostCPUTscInfo *tsc;
-     virTristateSwitch migratable; /* for host-passthrough mode */
-+    virTristateSwitch deprecated_feats;
- };
- 
- virCPUDef *virCPUDefNew(void);
-diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng
-index 3a8910e09f..8edf1d14e3 100644
---- a/src/conf/schemas/cputypes.rng
-+++ b/src/conf/schemas/cputypes.rng
-@@ -439,6 +439,11 @@
-       <optional>
-         <ref name="cpuCheck"/>
-       </optional>
-+      <optional>
-+        <attribute name="deprecated_features">
-+          <ref name="virOnOff"/>
-+        </attribute>
-+      </optional>
-       <optional>
-         <attribute name="migratable">
-           <ref name="virOnOff"/>
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index c1ae324ad4..64683ecfe0 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -6429,6 +6429,17 @@ qemuProcessUpdateGuestCPU(virDomainDef *def,
-                                 &def->os.arch) < 0)
-         return -1;
- 
-+    if (def->cpu->deprecated_feats &&
-+        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRECATED_PROPS)) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("toggling deprecated features for CPU model is unsupported"));
-+        return -1;
-+    }
-+
-+    if (def->cpu->deprecated_feats == VIR_TRISTATE_SWITCH_OFF) {
-+        virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, def->virtType, def->cpu);
-+    }
-+
-     return 0;
- }
- 
-diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-8.2.0.err b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-8.2.0.err
-new file mode 100644
-index 0000000000..936d1d5a46
---- /dev/null
-+++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-8.2.0.err
-@@ -0,0 +1 @@
-+unsupported configuration: toggling deprecated features for CPU model is unsupported
-diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-8.2.0.xml b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-8.2.0.xml
-new file mode 100644
-index 0000000000..e1f7ba3857
---- /dev/null
-+++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-8.2.0.xml
-@@ -0,0 +1,25 @@
-+<domain type='kvm'>
-+  <name>guest</name>
-+  <uuid>22782664-6b93-46bf-9595-317220dd2d1c</uuid>
-+  <memory unit='KiB'>219100</memory>
-+  <currentMemory unit='KiB'>219100</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio-8.2'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu mode='host-model' check='partial' deprecated_features='off'/>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <audio id='1' type='none'/>
-+    <memballoon model='virtio'>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
-+    </memballoon>
-+    <panic model='s390'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.args b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.args
-new file mode 100644
-index 0000000000..ba6e7c5304
---- /dev/null
-+++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.args
-@@ -0,0 +1,32 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/var/lib/libvirt/qemu/domain--1-guest \
-+USER=test \
-+LOGNAME=test \
-+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
-+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
-+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
-+/usr/bin/qemu-system-s390x \
-+-name guest=guest,debug-threads=on \
-+-S \
-+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \
-+-accel kvm \
-+-cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=off,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,appv=on,apqi=on,apft=on,els=on,iep=on,appvi=on,apqci=on,cte=off,ais=on,bpb=off,ctop=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=off,cmm=on,vxpdeh2=on \
-+-m size=219136k \
-+-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \
-+-overcommit mem-lock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid 22782664-6b93-46bf-9595-317220dd2d1c \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot strict=on \
-+-audiodev '{"id":"audio1","driver":"none"}' \
-+-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000"}' \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.xml b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.xml
-new file mode 100644
-index 0000000000..fdd87acb1d
---- /dev/null
-+++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.xml
-@@ -0,0 +1,25 @@
-+<domain type='kvm'>
-+  <name>guest</name>
-+  <uuid>22782664-6b93-46bf-9595-317220dd2d1c</uuid>
-+  <memory unit='KiB'>219100</memory>
-+  <currentMemory unit='KiB'>219100</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu mode='host-model' check='partial' deprecated_features='off'/>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <audio id='1' type='none'/>
-+    <memballoon model='virtio'>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
-+    </memballoon>
-+    <panic model='s390'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.xml b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.xml
-new file mode 100644
-index 0000000000..67950715ec
---- /dev/null
-+++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.xml
-@@ -0,0 +1,15 @@
-+<domain type='kvm'>
-+  <name>guest</name>
-+  <uuid>22782664-6b93-46bf-9595-317220dd2d1c</uuid>
-+  <memory unit='KiB'>219100</memory>
-+  <currentMemory unit='KiB'>219100</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
-+  </os>
-+  <cpu mode='host-model' check='partial' deprecated_features='off'/>
-+  <clock offset='utc'/>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index e88aa6da92..bed562286d 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -2300,6 +2300,9 @@ mymain(void)
-     DO_TEST_CAPS_ARCH_LATEST("cpu-s390-zEC12", "s390x");
-     DO_TEST_CAPS_ARCH_LATEST("cpu-s390-features", "s390x");
- 
-+    DO_TEST_CAPS_ARCH_VER_FAILURE("cpu-model-deprecated-features-off", "s390x", "8.2.0");
-+    DO_TEST_CAPS_ARCH_LATEST("cpu-model-deprecated-features-off", "s390x");
-+
-     DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
-     DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
-     DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell3", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
--- 
-2.49.0
diff --git a/SOURCES/libvirt-conf-add-passthrough-and-xtsup-attributes-for-IOMMU.patch b/SOURCES/libvirt-conf-add-passthrough-and-xtsup-attributes-for-IOMMU.patch
deleted file mode 100644
index d4fc76f..0000000
--- a/SOURCES/libvirt-conf-add-passthrough-and-xtsup-attributes-for-IOMMU.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 2cd8164cffc5be97e2836862a4fc44578dae2b47 Mon Sep 17 00:00:00 2001
-Message-ID: <2cd8164cffc5be97e2836862a4fc44578dae2b47.1752749355.git.jdenemar@redhat.com>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Fri, 14 Mar 2025 17:13:31 +0100
-Subject: [PATCH] conf: add passthrough and xtsup attributes for IOMMU
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-For the newly supported AMD device.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 856f667c8a3b44417f3b5bb42db5e8bf971bacd4)
-
-https://issues.redhat.com/browse/RHEL-50560
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
----
- docs/formatdomain.rst                         |  8 +++++
- src/conf/domain_conf.c                        | 30 +++++++++++++++++++
- src/conf/domain_conf.h                        |  2 ++
- src/conf/domain_validate.c                    |  9 ++++++
- src/conf/schemas/domaincommon.rng             | 10 +++++++
- src/qemu/qemu_command.c                       |  2 ++
- .../amd-iommu.x86_64-latest.args              |  2 +-
- tests/qemuxmlconfdata/amd-iommu.xml           |  2 +-
- 8 files changed, 63 insertions(+), 2 deletions(-)
-
-diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index ec7bdb07d0..847c9ebc6e 100644
---- a/docs/formatdomain.rst
-+++ b/docs/formatdomain.rst
-@@ -8885,6 +8885,14 @@ Example:
-       example to efficiently enable more than 255 vCPUs.
-       :since:`Since 10.7.0` (QEMU/KVM and ``intel`` model only)
- 
-+   ``passthrough``
-+      Enable passthrough. In this mode, DMA read/writes are not translated.
-+      :since:`Since 11.5.0` (QEMU/KVM and ``amd`` model only)
-+
-+   ``xtsup``
-+      Enable x2APIC mode. Useful for higher number of guest CPUs.
-+      :since:`Since 11.5.0` (QEMU/KVM and ``amd`` model only)
-+
- The ``virtio`` IOMMU devices can further have ``address`` element as described
- in `Device addresses`_ (address has to by type of ``pci``).
- 
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 7c8591e509..286e59a4c7 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -14063,6 +14063,14 @@ virDomainIOMMUDefParseXML(virDomainXMLOption *xmlopt,
-         if (virXMLPropTristateSwitch(driver, "dma_translation", VIR_XML_PROP_NONE,
-                                      &iommu->dma_translation) < 0)
-             return NULL;
-+
-+        if (virXMLPropTristateSwitch(driver, "xtsup", VIR_XML_PROP_NONE,
-+                                     &iommu->xtsup) < 0)
-+            return NULL;
-+
-+        if (virXMLPropTristateSwitch(driver, "passthrough", VIR_XML_PROP_NONE,
-+                                     &iommu->pt) < 0)
-+            return NULL;
-     }
- 
-     if (virDomainDeviceInfoParseXML(xmlopt, node, ctxt,
-@@ -21682,6 +21690,20 @@ virDomainIOMMUDefCheckABIStability(virDomainIOMMUDef *src,
-                        virTristateSwitchTypeToString(src->dma_translation));
-         return false;
-     }
-+    if (src->pt != dst->pt) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                       _("Target domain IOMMU device dma translation '%1$s' does not match source '%2$s'"),
-+                       virTristateSwitchTypeToString(dst->pt),
-+                       virTristateSwitchTypeToString(src->pt));
-+        return false;
-+    }
-+    if (src->xtsup != dst->xtsup) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                       _("Target domain IOMMU device dma translation '%1$s' does not match source '%2$s'"),
-+                       virTristateSwitchTypeToString(dst->xtsup),
-+                       virTristateSwitchTypeToString(src->xtsup));
-+        return false;
-+    }
- 
-     return virDomainDeviceInfoCheckABIStability(&src->info, &dst->info);
- }
-@@ -27735,6 +27757,14 @@ virDomainIOMMUDefFormat(virBuffer *buf,
-         virBufferAsprintf(&driverAttrBuf, " dma_translation='%s'",
-                           virTristateSwitchTypeToString(iommu->dma_translation));
-     }
-+    if (iommu->pt != VIR_TRISTATE_SWITCH_ABSENT) {
-+        virBufferAsprintf(&driverAttrBuf, " passthrough='%s'",
-+                          virTristateSwitchTypeToString(iommu->pt));
-+    }
-+    if (iommu->xtsup != VIR_TRISTATE_SWITCH_ABSENT) {
-+        virBufferAsprintf(&driverAttrBuf, " xtsup='%s'",
-+                          virTristateSwitchTypeToString(iommu->xtsup));
-+    }
- 
-     virXMLFormatElement(&childBuf, "driver", &driverAttrBuf, NULL);
- 
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 343bb9bae0..e59d2e6c5f 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -2987,6 +2987,8 @@ struct _virDomainIOMMUDef {
-     unsigned int aw_bits;
-     virDomainDeviceInfo info;
-     virTristateSwitch dma_translation;
-+    virTristateSwitch xtsup;
-+    virTristateSwitch pt;
- };
- 
- typedef enum {
-diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
-index 483cfbbe08..522fd0174f 100644
---- a/src/conf/domain_validate.c
-+++ b/src/conf/domain_validate.c
-@@ -2999,6 +2999,15 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu)
-         break;
- 
-     case VIR_DOMAIN_IOMMU_MODEL_INTEL:
-+        if (iommu->pt != VIR_TRISTATE_SWITCH_ABSENT ||
-+            iommu->xtsup != VIR_TRISTATE_SWITCH_ABSENT) {
-+            virReportError(VIR_ERR_XML_ERROR,
-+                           _("iommu model '%1$s' doesn't support some additional attributes"),
-+                           virDomainIOMMUModelTypeToString(iommu->model));
-+            return -1;
-+        }
-+        break;
-+
-     case VIR_DOMAIN_IOMMU_MODEL_LAST:
-         break;
-     }
-diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index 38a0586f40..1b153acc48 100644
---- a/src/conf/schemas/domaincommon.rng
-+++ b/src/conf/schemas/domaincommon.rng
-@@ -6210,6 +6210,16 @@
-                 <ref name="virOnOff"/>
-               </attribute>
-             </optional>
-+            <optional>
-+              <attribute name="xtsup">
-+                <ref name="virOnOff"/>
-+              </attribute>
-+            </optional>
-+            <optional>
-+              <attribute name="passthrough">
-+                <ref name="virOnOff"/>
-+              </attribute>
-+            </optional>
-           </element>
-         </optional>
-         <optional>
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index de535029a8..fffc8be08a 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6113,6 +6113,8 @@ qemuBuildIOMMUCommandLine(virCommand *cmd,
-                                   "s:driver", "amd-iommu",
-                                   "s:pci-id", iommu->info.alias,
-                                   "S:intremap", qemuOnOffAuto(iommu->intremap),
-+                                  "T:pt", iommu->pt,
-+                                  "T:xtsup", iommu->xtsup,
-                                   "T:device-iotlb", iommu->iotlb,
-                                   NULL) < 0)
-             return -1;
-diff --git a/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
-index 36244edb3a..20d7e379e6 100644
---- a/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
-@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
- -no-shutdown \
- -boot strict=on \
- -device '{"driver":"AMDVI-PCI","id":"iommu0","bus":"pcie.0","addr":"0x1"}' \
---device '{"driver":"amd-iommu","pci-id":"iommu0","intremap":"on","device-iotlb":true}' \
-+-device '{"driver":"amd-iommu","pci-id":"iommu0","intremap":"on","pt":true,"xtsup":true,"device-iotlb":true}' \
- -audiodev '{"id":"audio1","driver":"none"}' \
- -global ICH9-LPC.noreboot=off \
- -watchdog-action reset \
-diff --git a/tests/qemuxmlconfdata/amd-iommu.xml b/tests/qemuxmlconfdata/amd-iommu.xml
-index 0668ed4237..4ad79ce4ae 100644
---- a/tests/qemuxmlconfdata/amd-iommu.xml
-+++ b/tests/qemuxmlconfdata/amd-iommu.xml
-@@ -32,7 +32,7 @@
-     <watchdog model='itco' action='reset'/>
-     <memballoon model='none'/>
-     <iommu model='amd'>
--      <driver intremap='on' iotlb='on'/>
-+      <driver intremap='on' iotlb='on' passthrough='on' xtsup='on'/>
-       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-     </iommu>
-   </devices>
--- 
-2.50.1
diff --git a/SOURCES/libvirt-conf-change-virDomainHostdevInsert-to-return-void.patch b/SOURCES/libvirt-conf-change-virDomainHostdevInsert-to-return-void.patch
deleted file mode 100644
index 55007fc..0000000
--- a/SOURCES/libvirt-conf-change-virDomainHostdevInsert-to-return-void.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From de4d1cf7306b8c456ccd167f29d47c7fb7b49943 Mon Sep 17 00:00:00 2001
-Message-ID: <de4d1cf7306b8c456ccd167f29d47c7fb7b49943.1739824249.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Tue, 11 Feb 2025 16:44:49 -0500
-Subject: [PATCH] conf: change virDomainHostdevInsert() to return void
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We haven't checked for memalloc failure in many years, and that was
-the only reason this function would have ever failed.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 956c6684113b46b2350db698dc75604f4c3a4b76)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/conf/domain_conf.c   | 15 +++++----------
- src/conf/domain_conf.h   |  2 +-
- src/libxl/libxl_domain.c |  5 +----
- src/libxl/libxl_driver.c |  3 +--
- src/lxc/lxc_driver.c     |  3 +--
- src/qemu/qemu_driver.c   |  3 +--
- src/qemu/qemu_process.c  |  3 +--
- 7 files changed, 11 insertions(+), 23 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index d83f1ba240..cba0b162f4 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -14456,12 +14456,10 @@ virDomainChrTargetTypeToString(int deviceType,
-     return type;
- }
- 
--int
-+void
- virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev)
- {
-     VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev);
--
--    return 0;
- }
- 
- virDomainHostdevDef *
-@@ -14877,9 +14875,8 @@ virDomainDiskRemoveByName(virDomainDef *def, const char *name)
- int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net)
- {
-     /* hostdev net devices must also exist in the hostdevs array */
--    if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV &&
--        virDomainHostdevInsert(def, &net->data.hostdev.def) < 0)
--        return -1;
-+    if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV)
-+        virDomainHostdevInsert(def, &net->data.hostdev.def);
- 
-     VIR_APPEND_ELEMENT(def->nets, def->nnets, net);
-     return 0;
-@@ -19257,10 +19254,8 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt,
-          * where the actual network type is already known to be
-          * hostdev) must also be in the hostdevs array.
-          */
--        if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV &&
--            virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)) < 0) {
--            return NULL;
--        }
-+        if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV)
-+            virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net));
-     }
-     VIR_FREE(nodes);
- 
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 5237046196..2d38e8fa51 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -3982,7 +3982,7 @@ virDomainNetDef *virDomainNetRemove(virDomainDef *def, size_t i);
- virDomainNetDef *virDomainNetRemoveByObj(virDomainDef *def, virDomainNetDef *net);
- void virDomainNetRemoveHostdev(virDomainDef *def, virDomainNetDef *net);
- 
--int virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev);
-+void virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev);
- virDomainHostdevDef *
- virDomainHostdevRemove(virDomainDef *def, size_t i);
- int virDomainHostdevFind(virDomainDef *def, virDomainHostdevDef *match,
-diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
-index cad6c9ce42..711e22b8df 100644
---- a/src/libxl/libxl_domain.c
-+++ b/src/libxl/libxl_domain.c
-@@ -1015,10 +1015,7 @@ libxlNetworkPrepareDevices(virDomainDef *def)
-             /* Each type='hostdev' network device must also have a
-              * corresponding entry in the hostdevs array.
-              */
--            virDomainHostdevDef *hostdev = virDomainNetGetActualHostdev(net);
--
--            if (virDomainHostdevInsert(def, hostdev) < 0)
--                return -1;
-+            virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net));
-         }
-     }
- 
-diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index 29dcee3cfc..b670e697c6 100644
---- a/src/libxl/libxl_driver.c
-+++ b/src/libxl/libxl_driver.c
-@@ -3585,8 +3585,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev)
-                 return -1;
-             }
- 
--            if (virDomainHostdevInsert(vmdef, hostdev) < 0)
--                return -1;
-+            virDomainHostdevInsert(vmdef, hostdev);
-             dev->data.hostdev = NULL;
-             break;
- 
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index d682e7168a..9609d7d10c 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -3025,8 +3025,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef,
-                            _("device is already in the domain configuration"));
-             return -1;
-         }
--        if (virDomainHostdevInsert(vmdef, hostdev) < 0)
--            return -1;
-+        virDomainHostdevInsert(vmdef, hostdev);
-         dev->data.hostdev = NULL;
-         ret = 0;
-         break;
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 9a69574f31..379f9fb74f 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6734,8 +6734,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef,
-                            _("device is already in the domain configuration"));
-             return -1;
-         }
--        if (virDomainHostdevInsert(vmdef, hostdev))
--            return -1;
-+        virDomainHostdevInsert(vmdef, hostdev);
-         dev->data.hostdev = NULL;
-         break;
- 
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 1866c8f4e1..a45f1b5b7d 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5929,8 +5929,7 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm)
-             if (qemuDomainPrepareHostdev(hostdev, priv) < 0)
-                 return -1;
- 
--            if (virDomainHostdevInsert(def, hostdev) < 0)
--                return -1;
-+            virDomainHostdevInsert(def, hostdev);
-         }
-     }
-     return 0;
--- 
-2.48.1
diff --git a/SOURCES/libvirt-conf-docs-Add-support-for-direct-and-extended-tlbflush-features.patch b/SOURCES/libvirt-conf-docs-Add-support-for-direct-and-extended-tlbflush-features.patch
deleted file mode 100644
index 8f2f184..0000000
--- a/SOURCES/libvirt-conf-docs-Add-support-for-direct-and-extended-tlbflush-features.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From 2acec098dbc64f20d36f2b7592c2867885196141 Mon Sep 17 00:00:00 2001
-Message-ID: <2acec098dbc64f20d36f2b7592c2867885196141.1737030652.git.jdenemar@redhat.com>
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Fri, 20 Dec 2024 12:27:22 +0100
-Subject: [PATCH] conf, docs: Add support for direct and extended tlbflush
- features
-
-Similarly to stimer-direct these are subelements of <tlbflush/> in the
-domain XML.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit ac08b362da724f1dd7aa6f05c0a9e7a960a7f024)
-
-https://issues.redhat.com/browse/RHEL-7122
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
----
- docs/formatdomain.rst             | 13 ++++++++-----
- src/conf/domain_conf.c            | 26 +++++++++++++++++++++++++-
- src/conf/domain_conf.h            |  2 ++
- src/conf/schemas/domaincommon.rng | 21 ++++++++++++++++++++-
- src/cpu/cpu_x86.c                 |  7 +++++++
- src/cpu/cpu_x86_data.h            |  2 ++
- 6 files changed, 64 insertions(+), 7 deletions(-)
-
-diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index 60bee8bd4f..8d787ef59a 100644
---- a/docs/formatdomain.rst
-+++ b/docs/formatdomain.rst
-@@ -1993,7 +1993,10 @@ Hypervisors may allow certain CPU / machine features to be toggled on/off.
-        <vendor_id state='on' value='KVM Hv'/>
-        <frequencies state='on'/>
-        <reenlightenment state='on'/>
--       <tlbflush state='on'/>
-+       <tlbflush state='on'>
-+         <direct state='on'/>
-+         <extended state='on'/>
-+       </tlbflush>
-        <ipi state='on'/>
-        <evmcs state='on'/>
-        <emsr_bitmap state='on'/>
-@@ -2068,9 +2071,9 @@ are:
-    Enable various features improving behavior of guests running Microsoft
-    Windows.
- 
--   =============== ====================================================================== ============================================ =======================================================
-+   =============== ====================================================================== ============================================ ========================================================================
-    Feature         Description                                                            Value                                        Since
--   =============== ====================================================================== ============================================ =======================================================
-+   =============== ====================================================================== ============================================ ========================================================================
-    relaxed         Relax constraints on timers                                            on, off                                      :since:`1.0.0 (QEMU 2.0)`
-    vapic           Enable virtual APIC                                                    on, off                                      :since:`1.1.0 (QEMU 2.0)`
-    spinlocks       Enable spinlock support                                                on, off; retries - at least 4095             :since:`1.1.0 (QEMU 2.0)`
-@@ -2082,13 +2085,13 @@ are:
-    vendor_id       Set hypervisor vendor id                                               on, off; value - string, up to 12 characters :since:`1.3.3 (QEMU 2.5)`
-    frequencies     Expose frequency MSRs                                                  on, off                                      :since:`4.7.0 (QEMU 2.12)`
-    reenlightenment Enable re-enlightenment notification on migration                      on, off                                      :since:`4.7.0 (QEMU 3.0)`
--   tlbflush        Enable PV TLB flush support                                            on, off                                      :since:`4.7.0 (QEMU 3.0)`
-+   tlbflush        Enable PV TLB flush support                                            on, off; direct - on,off; extended - on,off  :since:`4.7.0 (QEMU 3.0), direct and extended modes 11.0.0 (QEMU 7.1.0)`
-    ipi             Enable PV IPI support                                                  on, off                                      :since:`4.10.0 (QEMU 3.1)`
-    evmcs           Enable Enlightened VMCS                                                on, off                                      :since:`4.10.0 (QEMU 3.1)`
-    avic            Enable use Hyper-V SynIC with hardware APICv/AVIC                      on, off                                      :since:`8.10.0 (QEMU 6.2)`
-    emsr_bitmap     Avoid unnecessary updates to L2 MSR Bitmap upon vmexits.               on, off                                      :since:`10.7.0 (QEMU 7.1)`
-    xmm_input       Enable XMM Fast Hypercall Input                                        on, off                                      :since:`10.7.0 (QEMU 7.1)`
--   =============== ====================================================================== ============================================ =======================================================
-+   =============== ====================================================================== ============================================ ========================================================================
- 
-    :since:`Since 8.0.0`, the hypervisor can be configured further by setting
-    the ``mode`` attribute to one of the following values:
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 4ad8289b89..c2164f6377 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -16672,7 +16672,6 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
-         case VIR_DOMAIN_HYPERV_RESET:
-         case VIR_DOMAIN_HYPERV_FREQUENCIES:
-         case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
--        case VIR_DOMAIN_HYPERV_TLBFLUSH:
-         case VIR_DOMAIN_HYPERV_IPI:
-         case VIR_DOMAIN_HYPERV_EVMCS:
-         case VIR_DOMAIN_HYPERV_AVIC:
-@@ -16680,6 +16679,31 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def,
-         case VIR_DOMAIN_HYPERV_XMM_INPUT:
-             break;
- 
-+        case VIR_DOMAIN_HYPERV_TLBFLUSH:
-+            if (value != VIR_TRISTATE_SWITCH_ON)
-+                break;
-+
-+            child = xmlFirstElementChild(node);
-+            while (child) {
-+                if (STREQ((const char *)child->name, "direct")) {
-+                    if (virXMLPropTristateSwitch(child, "state", VIR_XML_PROP_REQUIRED,
-+                                                 &def->hyperv_tlbflush_direct) < 0)
-+                        return -1;
-+                } else if (STREQ((const char *)child->name, "extended")) {
-+                    if (virXMLPropTristateSwitch(child, "state", VIR_XML_PROP_REQUIRED,
-+                                                 &def->hyperv_tlbflush_extended) < 0)
-+                        return -1;
-+                } else {
-+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                                   _("unsupported Hyper-V tlbflush feature: %1$s"),
-+                                   child->name);
-+                    return -1;
-+                }
-+
-+                child = xmlNextElementSibling(child);
-+            }
-+            break;
-+
-         case VIR_DOMAIN_HYPERV_STIMER:
-             if (value != VIR_TRISTATE_SWITCH_ON)
-                 break;
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index a187ab4083..9f7c28343f 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -3101,6 +3101,8 @@ struct _virDomainDef {
-     virDomainXenPassthroughMode xen_passthrough_mode;
-     unsigned int hyperv_spinlocks;
-     virTristateSwitch hyperv_stimer_direct;
-+    virTristateSwitch hyperv_tlbflush_direct;
-+    virTristateSwitch hyperv_tlbflush_extended;
-     virGICVersion gic_version;
-     virDomainHPTResizing hpt_resizing;
-     unsigned long long hpt_maxpagesize; /* Stored in KiB */
-diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index b3fdbf7ffb..7121519ca3 100644
---- a/src/conf/schemas/domaincommon.rng
-+++ b/src/conf/schemas/domaincommon.rng
-@@ -8027,7 +8027,7 @@
-             </optional>
-             <optional>
-               <element name="tlbflush">
--                <ref name="featurestate"/>
-+                <ref name="tlbflush"/>
-               </element>
-             </optional>
-             <optional>
-@@ -8075,6 +8075,25 @@
-     </interleave>
-   </define>
- 
-+  <!-- Hyper-V tlbflush features -->
-+  <define name="tlbflush">
-+    <interleave>
-+      <optional>
-+        <ref name="featurestate"/>
-+      </optional>
-+      <optional>
-+        <element name="direct">
-+          <ref name="featurestate"/>
-+        </element>
-+      </optional>
-+      <optional>
-+        <element name="extended">
-+          <ref name="featurestate"/>
-+        </element>
-+      </optional>
-+    </interleave>
-+  </define>
-+
-   <!-- Optional KVM features -->
-   <define name="kvm">
-     <element name="kvm">
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 13695802da..6d72d446c9 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -99,6 +99,8 @@ KVM_FEATURE_DEF(VIR_CPU_x86_HV_REENLIGHTENMENT,
- 
- KVM_FEATURE_DEF(VIR_CPU_x86_HV_STIMER_DIRECT,
-                 0x40000003, 0x0, 0x00080000);
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_TLBFLUSH_DIRECT,
-+                0x40000003, 0x0, 0x00004000);
- 
- KVM_FEATURE_DEF(VIR_CPU_x86_HV_TLBFLUSH,
-                 0x40000004, 0x00000004, 0x0);
-@@ -109,6 +111,9 @@ KVM_FEATURE_DEF(VIR_CPU_x86_HV_IPI,
- KVM_FEATURE_DEF(VIR_CPU_x86_HV_EVMCS,
-                 0x40000004, 0x00004000, 0x0);
- 
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_TLBFLUSH_EXT,
-+                0x40000004, 0x0, 0x00004000);
-+
- KVM_FEATURE_DEF(VIR_CPU_x86_HV_EMSR_BITMAP,
-                 0x4000000A, 0x00080000, 0x0);
- static virCPUx86Feature x86_kvm_features[] =
-@@ -130,6 +135,8 @@ static virCPUx86Feature x86_kvm_features[] =
-     KVM_FEATURE(VIR_CPU_x86_HV_EVMCS),
-     KVM_FEATURE(VIR_CPU_x86_HV_STIMER_DIRECT),
-     KVM_FEATURE(VIR_CPU_x86_HV_EMSR_BITMAP),
-+    KVM_FEATURE(VIR_CPU_x86_HV_TLBFLUSH_DIRECT),
-+    KVM_FEATURE(VIR_CPU_x86_HV_TLBFLUSH_EXT),
- };
- 
- typedef struct _virCPUx86Signature virCPUx86Signature;
-diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
-index 43ad2faeb1..448acbbeb2 100644
---- a/src/cpu/cpu_x86_data.h
-+++ b/src/cpu/cpu_x86_data.h
-@@ -60,6 +60,8 @@ struct _virCPUx86MSR {
- #define VIR_CPU_x86_HV_FREQUENCIES "hv-frequencies"
- #define VIR_CPU_x86_HV_REENLIGHTENMENT "hv-reenlightenment"
- #define VIR_CPU_x86_HV_TLBFLUSH  "hv-tlbflush"
-+#define VIR_CPU_x86_HV_TLBFLUSH_EXT "hv-tlbflush-ext"
-+#define VIR_CPU_x86_HV_TLBFLUSH_DIRECT "hv-tlbflush-direct"
- #define VIR_CPU_x86_HV_IPI       "hv-ipi"
- #define VIR_CPU_x86_HV_EVMCS     "hv-evmcs"
- #define VIR_CPU_x86_HV_AVIC      "hv-avic"
--- 
-2.47.1
diff --git a/SOURCES/libvirt-conf-introduce-support-for-multiple-ACPI-tables.patch b/SOURCES/libvirt-conf-introduce-support-for-multiple-ACPI-tables.patch
deleted file mode 100644
index 014d168..0000000
--- a/SOURCES/libvirt-conf-introduce-support-for-multiple-ACPI-tables.patch
+++ /dev/null
@@ -1,422 +0,0 @@
-From f4dffda866c49db8cd905d7fb4d35a70c996fa89 Mon Sep 17 00:00:00 2001
-Message-ID: <f4dffda866c49db8cd905d7fb4d35a70c996fa89.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 17 Feb 2025 16:30:07 +0000
-Subject: [PATCH] conf: introduce support for multiple ACPI tables
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Currently we parse
-
-   <os>
-     <acpi>
-       <table type="slic">...path...</table>
-     </acpi>
-   </os>
-
-into a flat 'char *slic_table' field which is rather an anti-pattern
-as it has special cased a single attribute type.
-
-This rewrites the internal design to permit multiple table types to
-be parsed, should we add more in future. Each type is currently
-permitted to only appear once.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 55f48d38522a4657815668dae9ed9184c8870766)
-Resolves: https://issues.redhat.com/browse/RHEL-81041
----
- src/conf/domain_conf.c          | 92 +++++++++++++++++++++++----------
- src/conf/domain_conf.h          | 21 +++++++-
- src/libvirt_private.syms        |  2 +
- src/libxl/libxl_conf.c          |  5 +-
- src/libxl/xen_xl.c              | 15 ++++--
- src/qemu/qemu_command.c         | 13 +++--
- src/security/security_dac.c     | 18 ++++---
- src/security/security_selinux.c | 16 +++---
- src/security/virt-aa-helper.c   |  5 +-
- 9 files changed, 134 insertions(+), 53 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 095b9bbaa2..b0628da279 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -1456,6 +1456,11 @@ VIR_ENUM_IMPL(virDomainOsDefFirmwareFeature,
-               "secure-boot",
- );
- 
-+VIR_ENUM_IMPL(virDomainOsACPITable,
-+              VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST,
-+              "slic",
-+);
-+
- VIR_ENUM_IMPL(virDomainCFPC,
-               VIR_DOMAIN_CFPC_LAST,
-               "none",
-@@ -3890,6 +3895,15 @@ virDomainSecDefFree(virDomainSecDef *def)
-     g_free(def);
- }
- 
-+void virDomainOSACPITableDefFree(virDomainOSACPITableDef *def)
-+{
-+    if (!def)
-+        return;
-+    g_free(def->path);
-+    g_free(def);
-+}
-+
-+
- static void
- virDomainOSDefClear(virDomainOSDef *os)
- {
-@@ -3915,7 +3929,9 @@ virDomainOSDefClear(virDomainOSDef *os)
-     g_free(os->cmdline);
-     g_free(os->dtb);
-     g_free(os->root);
--    g_free(os->slic_table);
-+    for (i = 0; i < os->nacpiTables; i++)
-+        virDomainOSACPITableDefFree(os->acpiTables[i]);
-+    g_free(os->acpiTables);
-     virDomainLoaderDefFree(os->loader);
-     g_free(os->bootloader);
-     g_free(os->bootloaderArgs);
-@@ -17849,40 +17865,57 @@ virDomainDefParseBootAcpiOptions(virDomainDef *def,
-     int n;
-     g_autofree xmlNodePtr *nodes = NULL;
-     g_autofree char *tmp = NULL;
-+    size_t ntables = 0;
-+    virDomainOSACPITableDef **tables = NULL;
-+    size_t i;
- 
-     if ((n = virXPathNodeSet("./os/acpi/table", ctxt, &nodes)) < 0)
-         return -1;
- 
--    if (n > 1) {
--        virReportError(VIR_ERR_XML_ERROR, "%s",
--                       _("Only one acpi table is supported"));
--        return -1;
--    }
-+    if (n == 0)
-+        return 0;
- 
--    if (n == 1) {
--        tmp = virXMLPropString(nodes[0], "type");
-+    tables = g_new0(virDomainOSACPITableDef *, n);
-+    for (i = 0; i < n; i++) {
-+        g_autofree char *path = virXMLNodeContentString(nodes[i]);
-+        virDomainOsACPITable type;
-+        size_t j;
- 
--        if (!tmp) {
--            virReportError(VIR_ERR_XML_ERROR, "%s",
--                           _("Missing acpi table type"));
--            return -1;
-+        if (!path)
-+            goto error;
-+
-+        if (virXMLPropEnum(nodes[i], "type",
-+                           virDomainOsACPITableTypeFromString,
-+                           VIR_XML_PROP_REQUIRED,
-+                           &type) < 0)
-+            goto error;
-+
-+        for (j = 0; j < i; j++) {
-+            if (tables[j]->type == type) {
-+                virReportError(VIR_ERR_XML_ERROR,
-+                               _("ACPI table type '%1$s' may only appear once"),
-+                               virDomainOsACPITableTypeToString(type));
-+                goto error;
-+            }
-         }
- 
--        if (STREQ_NULLABLE(tmp, "slic")) {
--            VIR_FREE(tmp);
--            if (!(tmp = virXMLNodeContentString(nodes[0])))
--                return -1;
--
--            def->os.slic_table = virFileSanitizePath(tmp);
--        } else {
--            virReportError(VIR_ERR_XML_ERROR,
--                           _("Unknown acpi table type: %1$s"),
--                           tmp);
--            return -1;
--        }
-+        tables[ntables] = g_new0(virDomainOSACPITableDef, 1);
-+        tables[ntables]->type = type;
-+        tables[ntables]->path = virFileSanitizePath(path);
-+        ntables++;
-     }
- 
-+    def->os.nacpiTables = ntables;
-+    def->os.acpiTables = tables;
-+
-     return 0;
-+
-+ error:
-+    for (i = 0; i < ntables; i++) {
-+        virDomainOSACPITableDefFree(tables[i]);
-+    }
-+    g_free(tables);
-+    return -1;
- }
- 
- 
-@@ -28447,11 +28480,16 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def,
-                           def->os.dtb);
-     virBufferEscapeString(buf, "<root>%s</root>\n",
-                           def->os.root);
--    if (def->os.slic_table) {
-+
-+    if (def->os.nacpiTables) {
-         virBufferAddLit(buf, "<acpi>\n");
-         virBufferAdjustIndent(buf, 2);
--        virBufferEscapeString(buf, "<table type='slic'>%s</table>\n",
--                              def->os.slic_table);
-+        for (i = 0; i < def->os.nacpiTables; i++) {
-+            virBufferAsprintf(buf, "<table type='%s'>",
-+                              virDomainOsACPITableTypeToString(def->os.acpiTables[i]->type));
-+            virBufferEscapeString(buf, "%s</table>\n",
-+                                  def->os.acpiTables[i]->path);
-+        }
-         virBufferAdjustIndent(buf, -2);
-         virBufferAddLit(buf, "</acpi>\n");
-     }
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 2d38e8fa51..f52b80caec 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -2462,6 +2462,24 @@ typedef enum {
- 
- VIR_ENUM_DECL(virDomainOsDefFirmwareFeature);
- 
-+typedef enum {
-+    VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC,
-+
-+    VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST
-+} virDomainOsACPITable;
-+
-+VIR_ENUM_DECL(virDomainOsACPITable);
-+
-+struct _virDomainOSACPITableDef {
-+    virDomainOsACPITable type;
-+    char *path;
-+};
-+
-+typedef struct _virDomainOSACPITableDef virDomainOSACPITableDef;
-+void virDomainOSACPITableDefFree(virDomainOSACPITableDef *def);
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainOSACPITableDef, virDomainOSACPITableDefFree);
-+
-+
- struct _virDomainOSDef {
-     int type;
-     virDomainOsDefFirmware firmware;
-@@ -2484,7 +2502,8 @@ struct _virDomainOSDef {
-     char *cmdline;
-     char *dtb;
-     char *root;
--    char *slic_table;
-+    size_t nacpiTables;
-+    virDomainOSACPITableDef **acpiTables;
-     virDomainLoaderDef *loader;
-     char *bootloader;
-     char *bootloaderArgs;
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 727ab52cfe..be313ad67b 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -609,6 +609,8 @@ virDomainObjTaint;
- virDomainObjUpdateModificationImpact;
- virDomainObjWait;
- virDomainObjWaitUntil;
-+virDomainOsACPITableTypeFromString;
-+virDomainOsACPITableTypeToString;
- virDomainOsDefFirmwareTypeFromString;
- virDomainOsDefFirmwareTypeToString;
- virDomainOSTypeFromString;
-diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index c404226e43..7d845b97ec 100644
---- a/src/libxl/libxl_conf.c
-+++ b/src/libxl/libxl_conf.c
-@@ -582,8 +582,9 @@ libxlMakeDomBuildInfo(virDomainDef *def,
-                           VIR_TRISTATE_SWITCH_ON);
- #endif
- 
--        /* copy SLIC table path to acpi_firmware */
--        b_info->u.hvm.acpi_firmware = g_strdup(def->os.slic_table);
-+        /* copy the table path to acpi_firmware */
-+        if (def->os.nacpiTables)
-+            b_info->u.hvm.acpi_firmware = g_strdup(def->os.acpiTables[0]->path);
- 
-         if (def->nsounds > 0) {
-             /*
-diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
-index 53f6871efc..062b753cea 100644
---- a/src/libxl/xen_xl.c
-+++ b/src/libxl/xen_xl.c
-@@ -106,6 +106,7 @@ xenParseXLOS(virConf *conf, virDomainDef *def, virCaps *caps)
-         g_autofree char *bios = NULL;
-         g_autofree char *bios_path = NULL;
-         g_autofree char *boot = NULL;
-+        g_autofree char *slic = NULL;
-         int val = 0;
- 
-         if (xenConfigGetString(conf, "bios", &bios, NULL) < 0)
-@@ -133,8 +134,15 @@ xenParseXLOS(virConf *conf, virDomainDef *def, virCaps *caps)
-             }
-         }
- 
--        if (xenConfigCopyStringOpt(conf, "acpi_firmware", &def->os.slic_table) < 0)
-+        if (xenConfigCopyStringOpt(conf, "acpi_firmware", &slic) < 0)
-             return -1;
-+        if (slic != NULL) {
-+            def->os.nacpiTables = 1;
-+            def->os.acpiTables = g_new0(virDomainOSACPITableDef *, 1);
-+            def->os.acpiTables[0] = g_new0(virDomainOSACPITableDef, 1);
-+            def->os.acpiTables[0]->type = VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC;
-+            def->os.acpiTables[0]->path = g_steal_pointer(&slic);
-+        }
- 
-         if (xenConfigCopyStringOpt(conf, "kernel", &def->os.kernel) < 0)
-             return -1;
-@@ -1134,8 +1142,9 @@ xenFormatXLOS(virConf *conf, virDomainDef *def)
-                 return -1;
-         }
- 
--        if (def->os.slic_table &&
--            xenConfigSetString(conf, "acpi_firmware", def->os.slic_table) < 0)
-+        if (def->os.nacpiTables &&
-+            xenConfigSetString(conf, "acpi_firmware",
-+                               def->os.acpiTables[0]->path) < 0)
-             return -1;
- 
-         if (def->os.kernel &&
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 24dac0ce0f..756dd2168b 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -127,6 +127,11 @@ VIR_ENUM_IMPL(qemuNumaPolicy,
-               "restrictive",
- );
- 
-+VIR_ENUM_DECL(qemuACPITableSIG);
-+VIR_ENUM_IMPL(qemuACPITableSIG,
-+              VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST,
-+              "SLIC");
-+
- 
- const char *
- qemuAudioDriverTypeToString(virDomainAudioType type)
-@@ -5968,6 +5973,7 @@ qemuBuildBootCommandLine(virCommand *cmd,
- {
-     g_auto(virBuffer) boot_buf = VIR_BUFFER_INITIALIZER;
-     g_autofree char *boot_opts_str = NULL;
-+    size_t i;
- 
-     if (def->os.bootmenu) {
-         if (def->os.bootmenu == VIR_TRISTATE_BOOL_YES)
-@@ -6001,11 +6007,12 @@ qemuBuildBootCommandLine(virCommand *cmd,
-         virCommandAddArgList(cmd, "-append", def->os.cmdline, NULL);
-     if (def->os.dtb)
-         virCommandAddArgList(cmd, "-dtb", def->os.dtb, NULL);
--    if (def->os.slic_table) {
-+    for (i = 0; i < def->os.nacpiTables; i++) {
-         g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-         virCommandAddArg(cmd, "-acpitable");
--        virBufferAddLit(&buf, "sig=SLIC,file=");
--        virQEMUBuildBufferEscapeComma(&buf, def->os.slic_table);
-+        virBufferAsprintf(&buf, "sig=%s,file=",
-+                          qemuACPITableSIGTypeToString(def->os.acpiTables[i]->type));
-+        virQEMUBuildBufferEscapeComma(&buf, def->os.acpiTables[i]->path);
-         virCommandAddArgBuffer(cmd, &buf);
-     }
- 
-diff --git a/src/security/security_dac.c b/src/security/security_dac.c
-index 0505f4e4a3..b4d61bc576 100644
---- a/src/security/security_dac.c
-+++ b/src/security/security_dac.c
-@@ -2050,9 +2050,10 @@ virSecurityDACRestoreAllLabel(virSecurityManager *mgr,
-         virSecurityDACRestoreFileLabel(mgr, def->os.dtb) < 0)
-         rc = -1;
- 
--    if (def->os.slic_table &&
--        virSecurityDACRestoreFileLabel(mgr, def->os.slic_table) < 0)
--        rc = -1;
-+    for (i = 0; i < def->os.nacpiTables; i++) {
-+        if (virSecurityDACRestoreFileLabel(mgr, def->os.acpiTables[i]->path) < 0)
-+            rc = -1;
-+    }
- 
-     if (def->pstore &&
-         virSecurityDACRestoreFileLabel(mgr, def->pstore->path) < 0)
-@@ -2300,11 +2301,12 @@ virSecurityDACSetAllLabel(virSecurityManager *mgr,
-                                    user, group, true) < 0)
-         return -1;
- 
--    if (def->os.slic_table &&
--        virSecurityDACSetOwnership(mgr, NULL,
--                                   def->os.slic_table,
--                                   user, group, true) < 0)
--        return -1;
-+    for (i = 0; i < def->os.nacpiTables; i++) {
-+        if (virSecurityDACSetOwnership(mgr, NULL,
-+                                       def->os.acpiTables[i]->path,
-+                                       user, group, true) < 0)
-+            return -1;
-+    }
- 
-     if (def->pstore &&
-         virSecurityDACSetOwnership(mgr, NULL,
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index cdc32d9b34..b8659e33d6 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -3013,9 +3013,10 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManager *mgr,
-         virSecuritySELinuxRestoreFileLabel(mgr, def->os.dtb, true) < 0)
-         rc = -1;
- 
--    if (def->os.slic_table &&
--        virSecuritySELinuxRestoreFileLabel(mgr, def->os.slic_table, true) < 0)
--        rc = -1;
-+    for (i = 0; i < def->os.nacpiTables; i++) {
-+        if (virSecuritySELinuxRestoreFileLabel(mgr, def->os.acpiTables[i]->path, true) < 0)
-+            rc = -1;
-+    }
- 
-     if (def->pstore &&
-         virSecuritySELinuxRestoreFileLabel(mgr, def->pstore->path, true) < 0)
-@@ -3443,10 +3444,11 @@ virSecuritySELinuxSetAllLabel(virSecurityManager *mgr,
-                                      data->content_context, true) < 0)
-         return -1;
- 
--    if (def->os.slic_table &&
--        virSecuritySELinuxSetFilecon(mgr, def->os.slic_table,
--                                     data->content_context, true) < 0)
--        return -1;
-+    for (i = 0; i < def->os.nacpiTables; i++) {
-+        if (virSecuritySELinuxSetFilecon(mgr, def->os.acpiTables[i]->path,
-+                                         data->content_context, true) < 0)
-+            return -1;
-+    }
- 
-     if (def->pstore &&
-         virSecuritySELinuxSetFilecon(mgr, def->pstore->path,
-diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
-index e82b5de2b4..e68e908994 100644
---- a/src/security/virt-aa-helper.c
-+++ b/src/security/virt-aa-helper.c
-@@ -1002,9 +1002,10 @@ get_files(vahControl * ctl)
-         if (vah_add_file(&buf, ctl->def->os.dtb, "r") != 0)
-             goto cleanup;
- 
--    if (ctl->def->os.slic_table)
--        if (vah_add_file(&buf, ctl->def->os.slic_table, "r") != 0)
-+    for (i = 0; i < ctl->def->os.nacpiTables; i++) {
-+        if (vah_add_file(&buf, ctl->def->os.acpiTables[i]->path, "r") != 0)
-             goto cleanup;
-+    }
- 
-     if (ctl->def->pstore)
-         if (vah_add_file(&buf, ctl->def->pstore->path, "rw") != 0)
--- 
-2.49.0
diff --git a/SOURCES/libvirt-conf-parse-interface-source-dev-for-all-interface-types-with-backend-type-passt.patch b/SOURCES/libvirt-conf-parse-interface-source-dev-for-all-interface-types-with-backend-type-passt.patch
deleted file mode 100644
index a2e1303..0000000
--- a/SOURCES/libvirt-conf-parse-interface-source-dev-for-all-interface-types-with-backend-type-passt.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 29ea0453595ee14cdd64b2e9c07343aa870426d0 Mon Sep 17 00:00:00 2001
-Message-ID: <29ea0453595ee14cdd64b2e9c07343aa870426d0.1744876587.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Thu, 6 Mar 2025 19:19:12 -0500
-Subject: [PATCH] conf: parse interface/source/@dev for all interface types
- (with backend type='passt')
-
-The original implementation of the passt backend for vhost-user
-interfaces erroneously forgot to parse:
-
-  <source dev='blah'/>
-
-for interface type='vhostuser', so it wasn't being added to the passt
-commandline, and also wasn't being saved to the domain config. Now we
-parse it whenever the <backend> type='passt', no matter what the
-interface type, and then throw an error during validation if
-source/@dev was specified for interface type = 'user|vhostuser' and
-backend type != 'passt'.
-
-Fixes: 1e9054b9c79d721a55f413c2983c5370044f8f60
-Resolves: https://issues.redhat.com/browse/RHEL-82539
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 4c979edaa545c8425f7a856c06ebc0de939d4b9f)
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/conf/domain_conf.c                                    | 8 +++++---
- src/conf/domain_validate.c                                | 8 +++++++-
- .../qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml | 2 ++
- 3 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index f6d3d849eb..726c3095ed 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -9919,9 +9919,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
-         break;
- 
-     case VIR_DOMAIN_NET_TYPE_USER:
--        def->sourceDev = virXMLPropString(source_node, "dev");
--        break;
--
-     case VIR_DOMAIN_NET_TYPE_NULL:
-     case VIR_DOMAIN_NET_TYPE_LAST:
-         break;
-@@ -10036,6 +10033,11 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
-         return NULL;
-     }
- 
-+    if (def->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
-+        def->sourceDev = virXMLPropString(source_node, "dev");
-+    }
-+
-+
-     def->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DEFAULT;
-     if (linkstate != NULL) {
-         if ((def->linkstate = virDomainNetInterfaceLinkStateTypeFromString(linkstate)) <= 0) {
-diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
-index 597ae3d938..9cedc8d6d2 100644
---- a/src/conf/domain_validate.c
-+++ b/src/conf/domain_validate.c
-@@ -2160,12 +2160,18 @@ virDomainNetDefValidate(const virDomainNetDef *net)
-     if (net->type != VIR_DOMAIN_NET_TYPE_USER &&
-         net->type != VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
-         if (net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
--            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                            _("The 'passt' backend can only be used with interface type='user' or type='vhostuser'"));
-             return -1;
-         }
-     }
- 
-+    if (net->sourceDev && net->backend.type != VIR_DOMAIN_NET_BACKEND_PASST) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("The 'dev' attribute of the <source> element can only be used with <interface> type='user' or type='vhostuser' if the <backend> type='passt'"));
-+        return -1;
-+    }
-+
-     if (net->nPortForwards > 0) {
-         size_t p;
- 
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml
-index a1f9366722..529aff11f8 100644
---- a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml
-+++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml
-@@ -33,6 +33,7 @@
-     <controller type='pci' index='0' model='pci-root'/>
-     <interface type='vhostuser'>
-       <mac address='00:11:22:33:44:55'/>
-+      <source dev='eth42'/>
-       <ip address='172.17.2.0' family='ipv4' prefix='24'/>
-       <ip address='2001:db8:ac10:fd01::feed' family='ipv6'/>
-       <portForward proto='tcp' address='2001:db8:ac10:fd01::1:10'>
-@@ -63,6 +64,7 @@
-     </interface>
-     <interface type='vhostuser'>
-       <mac address='00:11:22:33:44:11'/>
-+      <source dev='eth43'/>
-       <model type='virtio'/>
-       <backend type='passt'/>
-       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-conf-qemu-make-source-element-almost-optional-for-type-vhostuser.patch b/SOURCES/libvirt-conf-qemu-make-source-element-almost-optional-for-type-vhostuser.patch
deleted file mode 100644
index 2aef200..0000000
--- a/SOURCES/libvirt-conf-qemu-make-source-element-almost-optional-for-type-vhostuser.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 8aac60b3f07513fea6968b1f9d340f7408a3a8e6 Mon Sep 17 00:00:00 2001
-Message-ID: <8aac60b3f07513fea6968b1f9d340f7408a3a8e6.1739824249.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Sun, 9 Feb 2025 22:52:54 -0500
-Subject: [PATCH] conf/qemu: make <source> element *almost* optional for
- type=vhostuser
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-For some reason, when vhostuser interface support was added in 2014,
-the parser required that the XML for the <interface> have a <source>
-element with type, mode, and path, all 3 also required. This in spite
-of the fact that 'unix' is the only possible valid setting for type,
-and 95% of the time the mode is set to 'client' (as I understand from
-comments in the code, normally a guest will use mode='client' to
-connect to an existing socket that is precreated (by OVS?), and the
-only use for mode='server' is for test setups where one guest is setup
-with a listening vhostuser socket (i.e. 'server') and another guest
-connects to that socket (i.e. 'client')). (or maybe one guest connects
-to OVS in server mode, and all the others connect in client mode, not
-sure - I don't claim to be an expert on vhost-user.)
-
-So from the point of view of existing vhost-user functionality, it
-seems reasonable to make 'type' and 'mode' optional, and by default
-fill in the vhostuser part of the NetDef as if they were 'unix' and
-'client'.
-
-In theory, the <source> element itself is also not *directly* required
-after this patch, however, the path attribute of <source> *is*
-required (for now), so effectively the <source> element is still
-required.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit fb4bfa78589f7f556b6b0a176f109c94516d3cdd)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/conf/domain_conf.c            | 56 ++++++++++++-------------------
- src/conf/schemas/domaincommon.rng |  4 ++-
- src/qemu/qemu_validate.c          | 20 +++++++----
- 3 files changed, 39 insertions(+), 41 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index cba0b162f4..b1e9dda80e 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -9767,50 +9767,38 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
-         g_autofree char *vhostuser_type = NULL;
-         virDomainNetVhostuserMode vhostuser_mode;
- 
--        if (virDomainNetDefParseXMLRequireSource(def, source_node) < 0)
--            return NULL;
--
--        if (!(vhostuser_type = virXMLPropStringRequired(source_node, "type")))
--            return NULL;
--
--        if (STRNEQ_NULLABLE(vhostuser_type, "unix")) {
--            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--                           _("Type='%1$s' unsupported for <interface type='vhostuser'>"),
--                           vhostuser_type);
--            return NULL;
--        }
--
-         if (!(def->data.vhostuser = virDomainChrSourceDefNew(xmlopt)))
-             return NULL;
- 
-+        /* Default (and only valid) value of type is "unix".
-+         * Everything else's default value is 0/NULL.
-+         */
-         def->data.vhostuser->type = VIR_DOMAIN_CHR_TYPE_UNIX;
- 
--        if (!(def->data.vhostuser->data.nix.path = virXMLPropStringRequired(source_node, "path")))
--            return NULL;
-+        if (source_node) {
-+            if ((vhostuser_type = virXMLPropString(source_node, "type"))) {
-+                if (STRNEQ(vhostuser_type, "unix")) {
-+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                                   _("Type='%1$s' unsupported for <interface type='vhostuser'>"),
-+                                   vhostuser_type);
-+                    return NULL;
-+                }
-+            }
- 
--        if (virXMLPropEnum(source_node, "mode",
--                           virDomainNetVhostuserModeTypeFromString,
--                           VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
--                           &vhostuser_mode) < 0)
--            return NULL;
-+            def->data.vhostuser->data.nix.path = virXMLPropString(source_node, "path");
- 
--        switch (vhostuser_mode) {
--        case VIR_DOMAIN_NET_VHOSTUSER_MODE_CLIENT:
--            def->data.vhostuser->data.nix.listen = false;
--            break;
-+            if (virXMLPropEnum(source_node, "mode", virDomainNetVhostuserModeTypeFromString,
-+                               VIR_XML_PROP_NONZERO, &vhostuser_mode) < 0) {
-+                return NULL;
-+            }
- 
--        case VIR_DOMAIN_NET_VHOSTUSER_MODE_SERVER:
--            def->data.vhostuser->data.nix.listen = true;
--            break;
-+            if (vhostuser_mode == VIR_DOMAIN_NET_VHOSTUSER_MODE_SERVER)
-+                def->data.vhostuser->data.nix.listen = true;
- 
--        case VIR_DOMAIN_NET_VHOSTUSER_MODE_NONE:
--        case VIR_DOMAIN_NET_VHOSTUSER_MODE_LAST:
--            break;
-+            if (virDomainChrSourceReconnectDefParseXML(&def->data.vhostuser->data.nix.reconnect,
-+                                                       source_node, ctxt) < 0)
-+                return NULL;
-         }
--
--        if (virDomainChrSourceReconnectDefParseXML(&def->data.vhostuser->data.nix.reconnect,
--                                                   source_node, ctxt) < 0)
--            return NULL;
-     }
-         break;
- 
-diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index 7121519ca3..cbc093ca7b 100644
---- a/src/conf/schemas/domaincommon.rng
-+++ b/src/conf/schemas/domaincommon.rng
-@@ -3485,7 +3485,9 @@
-             <value>vhostuser</value>
-           </attribute>
-           <interleave>
--            <ref name="unixSocketSource"/>
-+            <optional>
-+              <ref name="unixSocketSource"/>
-+            </optional>
-             <ref name="interface-options"/>
-           </interleave>
-         </group>
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index b7b2e3d0af..eb8c5366f6 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -1810,12 +1810,20 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-         }
-     }
- 
--    if (net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER &&
--        net->data.vhostuser->data.nix.listen &&
--        net->data.vhostuser->data.nix.reconnect.enabled == VIR_TRISTATE_BOOL_YES) {
--        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                       _("'reconnect' attribute is not supported when source mode='server' for <interface type='vhostuser'>"));
--        return -1;
-+    if (net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
-+        if (!net->data.vhostuser->data.nix.path) {
-+            virReportError(VIR_ERR_XML_ERROR,
-+                           _("Missing required attribute '%1$s' in element '%2$s'"),
-+                           "path", "source");
-+            return -1;
-+        }
-+
-+        if (net->data.vhostuser->data.nix.listen &&
-+            net->data.vhostuser->data.nix.reconnect.enabled == VIR_TRISTATE_BOOL_YES) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("'reconnect' attribute is not supported when source mode='server' for <interface type='vhostuser'>"));
-+            return -1;
-+        }
-     }
- 
-     if (!virDomainNetIsVirtioModel(net)) {
--- 
-2.48.1
diff --git a/SOURCES/libvirt-conf-refactor-hyperv-features-formatting.patch b/SOURCES/libvirt-conf-refactor-hyperv-features-formatting.patch
deleted file mode 100644
index 192ec8f..0000000
--- a/SOURCES/libvirt-conf-refactor-hyperv-features-formatting.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 6f1673eb80487d090c4abc2feaf6a6821fb09580 Mon Sep 17 00:00:00 2001
-Message-ID: <6f1673eb80487d090c4abc2feaf6a6821fb09580.1737030652.git.jdenemar@redhat.com>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Mon, 6 Jan 2025 17:20:57 +0100
-Subject: [PATCH] conf: refactor hyperv features formatting
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add a nested buffer for whatever sub-elements a particular
-hyperv feature might have.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-(cherry picked from commit ad6b4d1fef275036b31a2bee435144871ebbcfbb)
-
-https://issues.redhat.com/browse/RHEL-7122
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
----
- src/conf/domain_conf.c | 46 +++++++++++++++++-------------------------
- 1 file changed, 19 insertions(+), 27 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index c2164f6377..c8254d2146 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -27954,13 +27954,15 @@ virDomainDefFormatFeatures(virBuffer *buf,
- 
-             virBufferAsprintf(&childBuf, "<hyperv mode='%s'>\n",
-                               virDomainHyperVModeTypeToString(def->features[i]));
--            virBufferAdjustIndent(&childBuf, 2);
-+
-             for (j = 0; j < VIR_DOMAIN_HYPERV_LAST; j++) {
-+                g_auto(virBuffer) hypervAttrBuf = VIR_BUFFER_INITIALIZER;
-+                g_auto(virBuffer) hypervChildBuf = VIR_BUFFER_INIT_CHILD(&tmpChildBuf);
-+
-                 if (def->hyperv_features[j] == VIR_TRISTATE_SWITCH_ABSENT)
-                     continue;
- 
--                virBufferAsprintf(&childBuf, "<%s state='%s'",
--                                  virDomainHypervTypeToString(j),
-+                virBufferAsprintf(&hypervAttrBuf, " state='%s'",
-                                   virTristateSwitchTypeToString(def->hyperv_features[j]));
- 
-                 switch ((virDomainHyperv) j) {
-@@ -27978,49 +27980,39 @@ virDomainDefFormatFeatures(virBuffer *buf,
-                 case VIR_DOMAIN_HYPERV_AVIC:
-                 case VIR_DOMAIN_HYPERV_EMSR_BITMAP:
-                 case VIR_DOMAIN_HYPERV_XMM_INPUT:
--                    virBufferAddLit(&childBuf, "/>\n");
-                     break;
- 
-                 case VIR_DOMAIN_HYPERV_SPINLOCKS:
--                    if (def->hyperv_features[j] != VIR_TRISTATE_SWITCH_ON) {
--                        virBufferAddLit(&childBuf, "/>\n");
--                        break;
-+                    if (def->hyperv_features[j] == VIR_TRISTATE_SWITCH_ON) {
-+                        virBufferAsprintf(&hypervAttrBuf,
-+                                          " retries='%d'", def->hyperv_spinlocks);
-                     }
--                    virBufferAsprintf(&childBuf, " retries='%d'/>\n",
--                                      def->hyperv_spinlocks);
-                     break;
- 
-                 case VIR_DOMAIN_HYPERV_STIMER:
--                    if (def->hyperv_features[j] != VIR_TRISTATE_SWITCH_ON) {
--                        virBufferAddLit(&childBuf, "/>\n");
--                        break;
--                    }
--                    if (def->hyperv_stimer_direct == VIR_TRISTATE_SWITCH_ON) {
--                        virBufferAddLit(&childBuf, ">\n");
--                        virBufferAdjustIndent(&childBuf, 2);
--                        virBufferAddLit(&childBuf, "<direct state='on'/>\n");
--                        virBufferAdjustIndent(&childBuf, -2);
--                        virBufferAddLit(&childBuf, "</stimer>\n");
--                    } else {
--                        virBufferAddLit(&childBuf, "/>\n");
-+                    if (def->hyperv_features[j] == VIR_TRISTATE_SWITCH_ON &&
-+                        def->hyperv_stimer_direct == VIR_TRISTATE_SWITCH_ON) {
-+                        virBufferAddLit(&hypervChildBuf, "<direct state='on'/>\n");
-                     }
- 
-                     break;
- 
-                 case VIR_DOMAIN_HYPERV_VENDOR_ID:
--                    if (def->hyperv_features[j] != VIR_TRISTATE_SWITCH_ON) {
--                        virBufferAddLit(&childBuf, "/>\n");
--                        break;
-+                    if (def->hyperv_features[j] == VIR_TRISTATE_SWITCH_ON) {
-+                        virBufferEscapeString(&hypervAttrBuf, " value='%s'",
-+                                              def->hyperv_vendor_id);
-                     }
--                    virBufferEscapeString(&childBuf, " value='%s'/>\n",
--                                          def->hyperv_vendor_id);
-                     break;
- 
-                 case VIR_DOMAIN_HYPERV_LAST:
-                     break;
-                 }
-+
-+                virXMLFormatElement(&tmpChildBuf, virDomainHypervTypeToString(j),
-+                                    &hypervAttrBuf, &hypervChildBuf);
-             }
--            virBufferAdjustIndent(&childBuf, -2);
-+
-+            virBufferAddBuffer(&childBuf, &tmpChildBuf);
-             virBufferAddLit(&childBuf, "</hyperv>\n");
-             break;
- 
--- 
-2.47.1
diff --git a/SOURCES/libvirt-conf-support-MSDM-ACPI-table-type.patch b/SOURCES/libvirt-conf-support-MSDM-ACPI-table-type.patch
deleted file mode 100644
index 6edcd23..0000000
--- a/SOURCES/libvirt-conf-support-MSDM-ACPI-table-type.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From bfde8a471a604ddc3bfe7ee5baddbedc379ddf34 Mon Sep 17 00:00:00 2001
-Message-ID: <bfde8a471a604ddc3bfe7ee5baddbedc379ddf34.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 17 Feb 2025 16:58:27 +0000
-Subject: [PATCH] conf: support MSDM ACPI table type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The MSDM ACPI table is an alternative for the SLIC table type,
-sometimes used by Microsoft for Windows Licensing checks:
-
-  https://learn.microsoft.com/en-us/previous-versions/windows/hardware/design/dn653305(v=vs.85)
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 32765cd14e99411dfd14a230be86f2aecf7e9a7a)
-Resolves: https://issues.redhat.com/browse/RHEL-81041
----
- docs/formatdomain.rst             | 4 ++++
- src/conf/domain_conf.c            | 1 +
- src/conf/domain_conf.h            | 1 +
- src/conf/schemas/domaincommon.rng | 1 +
- src/libxl/libxl_domain.c          | 1 +
- src/qemu/qemu_command.c           | 3 ++-
- src/qemu/qemu_validate.c          | 1 +
- 7 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index b03b5317aa..c144851b62 100644
---- a/docs/formatdomain.rst
-+++ b/docs/formatdomain.rst
-@@ -497,6 +497,10 @@ These options apply to any form of booting of the guest OS.
-      software licensing information. The ACPI table signature in the
-      header will be forced to ``SLIC`` (:since:`Since 1.3.5 (QEMU)`,
-      mis-interpreted as ``rawset`` :since:`Since 5.9.0 (Xen)`).
-+   * ``msdm``: a single ACPI table with header and data, providing
-+     Microsoft Data Management information. The ACPI table signature
-+     in the header will be forced to ``MSDM``
-+     (:since:`Since 11.2.0`).
- 
-    Each type may be used only once, except for ``raw`` which can
-    appear multiple times.
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 2ee0403c86..f6d3d849eb 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -1461,6 +1461,7 @@ VIR_ENUM_IMPL(virDomainOsACPITable,
-               "raw",
-               "rawset",
-               "slic",
-+              "msdm",
- );
- 
- VIR_ENUM_IMPL(virDomainCFPC,
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index bc3f42888e..961b7b056c 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -2466,6 +2466,7 @@ typedef enum {
-     VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW,
-     VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET,
-     VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC,
-+    VIR_DOMAIN_OS_ACPI_TABLE_TYPE_MSDM,
- 
-     VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST
- } virDomainOsACPITable;
-diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index 99bcc90d4f..d46eb44588 100644
---- a/src/conf/schemas/domaincommon.rng
-+++ b/src/conf/schemas/domaincommon.rng
-@@ -7192,6 +7192,7 @@
-               <value>raw</value>
-               <value>rawset</value>
-               <value>slic</value>
-+              <value>msdm</value>
-             </choice>
-           </attribute>
-           <ref name="absFilePath"/>
-diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
-index e31d92d903..c5a556ec78 100644
---- a/src/libxl/libxl_domain.c
-+++ b/src/libxl/libxl_domain.c
-@@ -339,6 +339,7 @@ libxlDomainDefValidate(const virDomainDef *def,
-             break;
- 
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW:
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_MSDM:
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("ACPI table type '%1$s' is not supported"),
-                            virDomainOsACPITableTypeToString(def->os.acpiTables[i]->type));
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index adf7b21b14..9fe191d3b9 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -132,7 +132,8 @@ VIR_ENUM_IMPL(qemuACPITableSIG,
-               VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST,
-               "", /* raw */
-               "", /* rawset */
--              "SLIC");
-+              "SLIC",
-+              "");
- 
- 
- const char *
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index b088e54dd0..378f502ea7 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -734,6 +734,7 @@ qemuValidateDomainDefBoot(const virDomainDef *def,
-             break;
- 
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET:
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_MSDM:
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("ACPI table type '%1$s' is not supported"),
-                            virDomainOsACPITableTypeToString(def->os.acpiTables[i]->type));
--- 
-2.49.0
diff --git a/SOURCES/libvirt-cpu_map-Add-486-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-486-v1-CPU-model.patch
deleted file mode 100644
index 19af217..0000000
--- a/SOURCES/libvirt-cpu_map-Add-486-v1-CPU-model.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-From 307d105889cf0645b40d2ed7d7286f7124964732 Mon Sep 17 00:00:00 2001
-Message-ID: <307d105889cf0645b40d2ed7d7286f7124964732.1734433245.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:20:54 +0100
-Subject: [PATCH] cpu_map: Add 486-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 2abf6bd47c795c05d299285876977394e60479e4)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_486-v1.xml                         | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
- 43 files changed, 88 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_486-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 287cd7395e..e9fb278fd3 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -5,6 +5,7 @@
- 
-     <group name='generic'>
-       <include filename='x86_486.xml'/>
-+      <include filename='x86_486-v1.xml'/>
-     </group>
- 
-     <group name='Intel-based QEMU generic CPU models'>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index f659ef230e..b335278b08 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -22,6 +22,7 @@ cpumap_data = [
-   'ppc64_POWERPC_e5500.xml',
-   'ppc64_POWERPC_e6500.xml',
-   'ppc64_vendors.xml',
-+  'x86_486-v1.xml',
-   'x86_486.xml',
-   'x86_athlon.xml',
-   'x86_Broadwell-IBRS.xml',
-diff --git a/src/cpu_map/x86_486-v1.xml b/src/cpu_map/x86_486-v1.xml
-new file mode 100644
-index 0000000000..33f7ee09b5
---- /dev/null
-+++ b/src/cpu_map/x86_486-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='486-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='486'/>
-+  </model>
-+</cpus>
-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 5fa2d07976..46f1bd7d4f 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -62,7 +62,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 0348a65589..7153fe3925 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -74,7 +74,8 @@
-       <feature policy='disable' name='misalignsse'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 49a18cd333..93df9af8f6 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -61,7 +61,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 b990a2d597..25b16b34bb 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -62,7 +62,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 6746479be5..c9a124cda2 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -75,7 +75,8 @@
-       <feature policy='disable' name='misalignsse'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 81c9bb1444..a99c89e98b 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -61,7 +61,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 0cd73ee54f..c4f95a282b 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -63,7 +63,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 8a09c53177..b6f01ffbce 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -75,7 +75,8 @@
-       <feature policy='disable' name='misalignsse'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 5a23dfee52..5d3c1ab1aa 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -62,7 +62,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 84e783f739..c24b88f412 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -63,7 +63,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 4d7ed1eea8..eb8f5e3f22 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -77,7 +77,8 @@
-       <feature policy='disable' name='misalignsse'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 0446dff4fb..b1f198d62b 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -62,7 +62,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 e5718bc50c..7a4830b126 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -64,7 +64,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 c3a93369e4..d624842aab 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -78,7 +78,8 @@
-       <feature policy='disable' name='misalignsse'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 7415bda6bf..43bcca9b52 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -63,7 +63,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 720387e9db..275ce525fe 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -65,7 +65,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 3000d11487..6500ceac17 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -78,7 +78,8 @@
-       <feature policy='disable' name='misalignsse'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 31fe652a9f..1e54981f3c 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -64,7 +64,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 88db1c659e..5b1bb3ad55 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -70,7 +70,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 3392f2b42f..339c622684 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
-@@ -67,7 +67,8 @@
-       <feature policy='disable' name='nrip-save'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='3dnowprefetch'/>
-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 3392f2b42f..339c622684 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -67,7 +67,8 @@
-       <feature policy='disable' name='nrip-save'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 5223dbb2e2..a016f77b09 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -69,7 +69,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 e43c6710e9..9a42375791 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -70,7 +70,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 3d5c15fdf1..677ebbf2e6 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -71,7 +71,8 @@
-       <feature policy='disable' name='nrip-save'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 420dae738f..1eb4af3fdc 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -69,7 +69,8 @@
-       <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 e5853535ce..e2fa9da460 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -72,7 +72,8 @@
-       <feature policy='disable' name='xsaves'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-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 22c40afdb1..787fc9d870 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -72,7 +72,8 @@
-       <feature policy='disable' name='nrip-save'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='hle'/>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index c40cbb8a73..3fa195c6aa 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -71,7 +71,8 @@
-       <feature policy='disable' name='xsaves'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index cfc4b3e301..5fe9ab775c 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -73,7 +73,8 @@
-       <feature policy='disable' name='xsaves'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 4383050d3c..5c9f1c92a5 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -71,7 +71,8 @@
-       <feature policy='disable' name='nrip-save'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='hle'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 062d91ba9a..73f129706d 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -72,7 +72,8 @@
-       <feature policy='disable' name='xsaves'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index e8053efc99..2315bda338 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -73,7 +73,8 @@
-       <feature policy='disable' name='xsaves'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 8f3357be6f..90c9862321 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -73,7 +73,8 @@
-       <feature policy='disable' name='nrip-save'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='hle'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index db12bd81e3..983597be92 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -72,7 +72,8 @@
-       <feature policy='disable' name='xsaves'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index c3a7aff766..578dea23a5 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -77,7 +77,8 @@
-       <feature policy='disable' name='xsaves'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index a18ce928a5..2009920390 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -72,7 +72,8 @@
-       <feature policy='disable' name='nrip-save'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='hle'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 5019918b9b..505ea9978f 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -76,7 +76,8 @@
-       <feature policy='disable' name='xsaves'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 5cd872831b..e78f6a9dd3 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -77,7 +77,8 @@
-       <feature policy='disable' name='xsaves'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 7afc9e3d69..da9f2a1193 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -72,7 +72,8 @@
-       <feature policy='disable' name='nrip-save'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='hle'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 11cfc7863d..74d1094511 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -76,7 +76,8 @@
-       <feature policy='disable' name='xsaves'/>
-     </mode>
-     <mode name='custom' supported='yes'>
--      <model usable='yes' vendor='unknown'>486</model>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-       <blockers model='Broadwell'>
-         <feature name='erms'/>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch
deleted file mode 100644
index 44954a5..0000000
--- a/SOURCES/libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch
+++ /dev/null
@@ -1,684 +0,0 @@
-From 4d951963cb08a659ab1a3077cabd6111d586f39f Mon Sep 17 00:00:00 2001
-Message-ID: <4d951963cb08a659ab1a3077cabd6111d586f39f.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:38:08 +0100
-Subject: [PATCH] cpu_map: Add Conroe-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 2d061eba8c2b7907cad1fe80fb6e2b1707417ed3)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                               | 1 +
- src/cpu_map/meson.build                             | 1 +
- src/cpu_map/x86_Conroe-v1.xml                       | 6 ++++++
- tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml | 2 +-
- tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml   | 2 +-
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml  | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml          | 3 ++-
- 45 files changed, 90 insertions(+), 42 deletions(-)
- create mode 100644 src/cpu_map/x86_Conroe-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index a9a8d1b2c4..e9a180526e 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -39,6 +39,7 @@
- 
-     <group name='Intel CPU models'>
-       <include filename='x86_Conroe.xml'/>
-+      <include filename='x86_Conroe-v1.xml'/>
-       <include filename='x86_Penryn.xml'/>
-       <include filename='x86_Nehalem.xml'/>
-       <include filename='x86_Nehalem-IBRS.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 7ea53373ae..cbf7bb407b 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -40,6 +40,7 @@ cpumap_data = [
-   'x86_Cascadelake-Server-v4.xml',
-   'x86_Cascadelake-Server-v5.xml',
-   'x86_Cascadelake-Server.xml',
-+  'x86_Conroe-v1.xml',
-   'x86_Conroe.xml',
-   'x86_Cooperlake-v1.xml',
-   'x86_Cooperlake-v2.xml',
-diff --git a/src/cpu_map/x86_Conroe-v1.xml b/src/cpu_map/x86_Conroe-v1.xml
-new file mode 100644
-index 0000000000..8dd626795a
---- /dev/null
-+++ b/src/cpu_map/x86_Conroe-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='Conroe-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='Conroe'/>
-+  </model>
-+</cpus>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
-index dae7f8846e..6625ebc44d 100644
---- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Conroe</model>
-+  <model>Conroe-v1</model>
-   <vendor>Intel</vendor>
-   <signature family='6' model='15' stepping='11'/>
-   <feature name='dtes64'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
-index ec509f92e4..cca99c7b04 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Conroe</model>
-+  <model>Conroe-v1</model>
-   <vendor>Intel</vendor>
-   <signature family='6' model='15' stepping='6'/>
-   <feature name='dtes64'/>
-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 985a00cf84..3a14131fda 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -218,7 +218,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 74aa563566..5223402151 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -350,7 +350,8 @@
-         <feature name='x2apic'/>
-         <feature name='xsavec'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 4fdeaec417..a3638c64a4 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -217,7 +217,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 284d70c7cc..9af3b3768d 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -218,7 +218,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 07097ce25b..7932c25f39 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -351,7 +351,8 @@
-         <feature name='x2apic'/>
-         <feature name='xsavec'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 1aefe0ea08..72c598466a 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -217,7 +217,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 2ffe8cb354..b3ba5b020d 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -234,7 +234,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx-vnni'/>
-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 2a084c64fe..69a73ea9b2 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -379,7 +379,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index bda2e0ef68..54edabd43f 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -233,7 +233,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx-vnni'/>
-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 d2fbcad98c..be908c6cc6 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -234,7 +234,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 60093eda9a..8fb08191ea 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -381,7 +381,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index eafdc53ff6..1f9bdf36af 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -233,7 +233,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 03896267d5..14081dfafd 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -235,7 +235,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 52eb4b8215..d9ba0202bd 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -382,7 +382,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index f212097662..bba1b69e41 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -234,7 +234,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 38b0f47092..9fb0fbe581 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -236,7 +236,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 43de9e5193..b7f01c2b58 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -382,7 +382,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 92514055c9..f7e9853077 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -235,7 +235,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 10017064b8..4b670c95fe 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -241,7 +241,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 95b582af9f..8b85bd98b4 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
-@@ -311,7 +311,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='3dnowprefetch'/>
-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 95b582af9f..8b85bd98b4 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -311,7 +311,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 1e40bc5b23..0e1328f1fc 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -240,7 +240,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 392ec1e232..b3040a9e6e 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -241,7 +241,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 0893277250..ac533cccfa 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -315,7 +315,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 52ef9718d0..0558eb7588 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -240,7 +240,8 @@
-         <feature name='pku'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 ef74bbd2fa..3b334589ed 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -244,7 +244,8 @@
-         <feature name='spec-ctrl'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-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 404237ef67..9815a01beb 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -266,7 +266,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='arch-capabilities'/>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index eafacf0b61..3b1796949f 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -243,7 +243,8 @@
-         <feature name='spec-ctrl'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index c544eb02e3..c4d2a768bd 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -245,7 +245,8 @@
-         <feature name='spec-ctrl'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index b7b0ddd7c4..207092ba7b 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -265,7 +265,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='arch-capabilities'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index a4c86941c6..855dfef498 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -244,7 +244,8 @@
-         <feature name='spec-ctrl'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 06341f125a..f7ddcd9aff 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -245,7 +245,8 @@
-         <feature name='spec-ctrl'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index e759a15ea7..3419e26d32 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -252,7 +252,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='arch-capabilities'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index eb4822c667..43bc77f7cc 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -244,7 +244,8 @@
-         <feature name='spec-ctrl'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index a6c7d8e74c..0a962420cd 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -249,7 +249,8 @@
-         <feature name='spec-ctrl'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 18070cd01a..02209df41b 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -251,7 +251,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='arch-capabilities'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index e008a2f2e9..49e1df7be4 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -248,7 +248,8 @@
-         <feature name='spec-ctrl'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index ce19774d0d..56449ad3db 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -249,7 +249,8 @@
-         <feature name='spec-ctrl'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 217fbfe51c..04a759a16b 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -251,7 +251,8 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='arch-capabilities'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 4f34340651..7b3379b3e5 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -248,7 +248,8 @@
-         <feature name='spec-ctrl'/>
-         <feature name='xsaves'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Conroe</model>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-       <blockers model='Cooperlake'>
-         <feature name='avx512-bf16'/>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch
deleted file mode 100644
index 99d7c11..0000000
--- a/SOURCES/libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch
+++ /dev/null
@@ -1,869 +0,0 @@
-From c849388f86989e8bced51ad498b58c7cd40af179 Mon Sep 17 00:00:00 2001
-Message-ID: <c849388f86989e8bced51ad498b58c7cd40af179.1734433247.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 16:02:17 +0100
-Subject: [PATCH] cpu_map: Add EPYC-Genoa-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit da2439b746c5da1b6544d6e1cc0d6dd6b9691a1b)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                         |  1 +
- src/cpu_map/meson.build                       |  1 +
- src/cpu_map/x86_EPYC-Genoa-v1.xml             |  6 +++
- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml  | 32 +++++++++++++-
- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml  | 42 ++++++++++++++++++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml    | 32 +++++++++++++-
- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml  | 32 +++++++++++++-
- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml  | 41 +++++++++++++++++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml    | 32 +++++++++++++-
- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml  | 32 +++++++++++++-
- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml  | 41 +++++++++++++++++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml    | 32 +++++++++++++-
- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml  | 32 +++++++++++++-
- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml  | 41 +++++++++++++++++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml    | 32 +++++++++++++-
- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml  | 32 +++++++++++++-
- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml  | 41 +++++++++++++++++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml    | 32 +++++++++++++-
- 18 files changed, 519 insertions(+), 15 deletions(-)
- create mode 100644 src/cpu_map/x86_EPYC-Genoa-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 9bd90cc83b..8e74195312 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -161,6 +161,7 @@
-       <include filename='x86_EPYC-Milan-v1.xml'/>
-       <include filename='x86_EPYC-Milan-v2.xml'/>
-       <include filename='x86_EPYC-Genoa.xml'/>
-+      <include filename='x86_EPYC-Genoa-v1.xml'/>
-     </group>
- 
-     <group name='Hygon CPU models'>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 5ac3c82dc7..fa7faa4016 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -59,6 +59,7 @@ cpumap_data = [
-   'x86_Dhyana-v1.xml',
-   'x86_Dhyana-v2.xml',
-   'x86_Dhyana.xml',
-+  'x86_EPYC-Genoa-v1.xml',
-   'x86_EPYC-Genoa.xml',
-   'x86_EPYC-IBPB.xml',
-   'x86_EPYC-Milan-v1.xml',
-diff --git a/src/cpu_map/x86_EPYC-Genoa-v1.xml b/src/cpu_map/x86_EPYC-Genoa-v1.xml
-new file mode 100644
-index 0000000000..df45ca18ff
---- /dev/null
-+++ b/src/cpu_map/x86_EPYC-Genoa-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='EPYC-Genoa-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='EPYC-Genoa'/>
-+  </model>
-+</cpus>
-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 197efcbe59..e80e175376 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -334,7 +334,7 @@
-         <feature name='xsaves'/>
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='auto-ibrs'/>
-@@ -364,6 +364,36 @@
-         <feature name='vpclmulqdq'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-       <blockers model='EPYC-Milan'>
-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 07fdd0c3a3..62ffabb3e2 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -414,7 +414,7 @@
-         <feature name='topoext'/>
-         <feature name='xsavec'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='amd-ssbd'/>
-@@ -454,6 +454,46 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='gfni'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='lfence-always-serializing'/>
-+        <feature name='misalignsse'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='nrip-save'/>
-+        <feature name='null-sel-clr-base'/>
-+        <feature name='osvw'/>
-+        <feature name='pcid'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='sha-ni'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='topoext'/>
-+        <feature name='vnmi'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <blockers model='EPYC-IBPB'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index ec95c1a2ac..4117d926cb 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -333,7 +333,7 @@
-         <feature name='xsaves'/>
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='auto-ibrs'/>
-@@ -363,6 +363,36 @@
-         <feature name='vpclmulqdq'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-       <blockers model='EPYC-Milan'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index d1d330df87..dfa88bcf96 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -335,7 +335,7 @@
-         <feature name='xsaves'/>
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='auto-ibrs'/>
-@@ -365,6 +365,36 @@
-         <feature name='vpclmulqdq'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-       <blockers model='EPYC-Milan'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 75cb1b8f17..327cad253e 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -408,7 +408,7 @@
-         <feature name='topoext'/>
-         <feature name='xsavec'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='amd-ssbd'/>
-@@ -447,6 +447,45 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='gfni'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='lfence-always-serializing'/>
-+        <feature name='misalignsse'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='nrip-save'/>
-+        <feature name='null-sel-clr-base'/>
-+        <feature name='osvw'/>
-+        <feature name='pcid'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='topoext'/>
-+        <feature name='vnmi'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <blockers model='EPYC-IBPB'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 5f6e72e7ca..f8dbb717f1 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -334,7 +334,7 @@
-         <feature name='xsaves'/>
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='auto-ibrs'/>
-@@ -364,6 +364,36 @@
-         <feature name='vpclmulqdq'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-       <blockers model='EPYC-Milan'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 3c005d0c10..c5a653f57b 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -335,7 +335,7 @@
-         <feature name='xsaves'/>
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='auto-ibrs'/>
-@@ -365,6 +365,36 @@
-         <feature name='vpclmulqdq'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-       <blockers model='EPYC-Milan'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 3a6424eddf..30876c5fef 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -388,7 +388,7 @@
-         <feature name='topoext'/>
-         <feature name='xsavec'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='amd-ssbd'/>
-@@ -427,6 +427,45 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='gfni'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='lfence-always-serializing'/>
-+        <feature name='misalignsse'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='nrip-save'/>
-+        <feature name='null-sel-clr-base'/>
-+        <feature name='osvw'/>
-+        <feature name='pcid'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='topoext'/>
-+        <feature name='vnmi'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <blockers model='EPYC-IBPB'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 79c39678ca..6c141e1cb9 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -334,7 +334,7 @@
-         <feature name='xsaves'/>
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='auto-ibrs'/>
-@@ -364,6 +364,36 @@
-         <feature name='vpclmulqdq'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-       <blockers model='EPYC-Milan'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 117947ef13..9445d999b5 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -339,7 +339,7 @@
-         <feature name='xsaves'/>
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='auto-ibrs'/>
-@@ -369,6 +369,36 @@
-         <feature name='vpclmulqdq'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-       <blockers model='EPYC-Milan'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index c2c244f464..61d92550c1 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -387,7 +387,7 @@
-         <feature name='topoext'/>
-         <feature name='xsavec'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='amd-ssbd'/>
-@@ -426,6 +426,45 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='gfni'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='lfence-always-serializing'/>
-+        <feature name='misalignsse'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='nrip-save'/>
-+        <feature name='null-sel-clr-base'/>
-+        <feature name='osvw'/>
-+        <feature name='pcid'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='topoext'/>
-+        <feature name='vnmi'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <blockers model='EPYC-IBPB'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 30959cd723..5e87efe5e8 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -338,7 +338,7 @@
-         <feature name='xsaves'/>
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='auto-ibrs'/>
-@@ -368,6 +368,36 @@
-         <feature name='vpclmulqdq'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-       <blockers model='EPYC-Milan'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 5fc9576495..99445e5f44 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -339,7 +339,7 @@
-         <feature name='xsaves'/>
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='auto-ibrs'/>
-@@ -369,6 +369,36 @@
-         <feature name='vpclmulqdq'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-       <blockers model='EPYC-Milan'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index eeba43f9fa..8bf967c99f 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -387,7 +387,7 @@
-         <feature name='topoext'/>
-         <feature name='xsavec'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='amd-ssbd'/>
-@@ -426,6 +426,45 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='gfni'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='lfence-always-serializing'/>
-+        <feature name='misalignsse'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='nrip-save'/>
-+        <feature name='null-sel-clr-base'/>
-+        <feature name='osvw'/>
-+        <feature name='pcid'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='topoext'/>
-+        <feature name='vnmi'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <blockers model='EPYC-IBPB'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 96d789ee1c..40aa971144 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -338,7 +338,7 @@
-         <feature name='xsaves'/>
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
--      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-       <blockers model='EPYC-Genoa'>
-         <feature name='amd-psfd'/>
-         <feature name='auto-ibrs'/>
-@@ -368,6 +368,36 @@
-         <feature name='vpclmulqdq'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-       <blockers model='EPYC-Milan'>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-GraniteRapids-v2-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-GraniteRapids-v2-CPU-model.patch
deleted file mode 100644
index 1a18848..0000000
--- a/SOURCES/libvirt-cpu_map-Add-GraniteRapids-v2-CPU-model.patch
+++ /dev/null
@@ -1,669 +0,0 @@
-From 7a9d85a3159fdc0ecec40338f7f28df91ba08a0c Mon Sep 17 00:00:00 2001
-Message-ID: <7a9d85a3159fdc0ecec40338f7f28df91ba08a0c.1747908717.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 18 Dec 2024 13:46:25 +0100
-Subject: [PATCH] cpu_map: Add GraniteRapids-v2 CPU model
-
-Introduced by QEMU 9.2.0
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 41a6de76bc6e31a206d9d82c84c5d485b710fe01)
-
-https://issues.redhat.com/browse/RHEL-71897
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 4dbeaa7e1ce9fffb3e2a2b19ba10cc3d2c19091d)
-
-    Conflicts:
-        - tests/domaincapsdata/qemu_10.0.0* were updated by a later
-          upstream commit (712c39f987e1fb75a9fe3168dfb2501b719b5070)
-          which was already backported to RHEL-9 as commit
-          d056b57fff98c30ef64a695dec44a2ddfcc1c55b with the hunks
-          related to GraniteRapids-v2 removed, thus this backport has to
-          incorporate those hunks
-
-https://issues.redhat.com/browse/RHEL-87796
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-
-=> 4c2001ea03d9466db571ddf07248c20d652ac775
----
- src/cpu_map/index.xml                         |   1 +
- src/cpu_map/meson.build                       |   1 +
- src/cpu_map/x86_GraniteRapids-v2.xml          | 206 ++++++++++++++++++
- .../domaincapsdata/qemu_10.0.0-q35.x86_64.xml |  57 +++++
- .../domaincapsdata/qemu_10.0.0-tcg.x86_64.xml |  47 ++++
- tests/domaincapsdata/qemu_10.0.0.x86_64.xml   |  57 +++++
- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml  |  57 +++++
- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml  |  47 ++++
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml    |  57 +++++
- 9 files changed, 530 insertions(+)
- create mode 100644 src/cpu_map/x86_GraniteRapids-v2.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 8e74195312..dba2f21811 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -121,6 +121,7 @@
-       <include filename='x86_SapphireRapids-v3.xml'/>
-       <include filename='x86_GraniteRapids.xml'/>
-       <include filename='x86_GraniteRapids-v1.xml'/>
-+      <include filename='x86_GraniteRapids-v2.xml'/>
-       <include filename='x86_SierraForest.xml'/>
-       <include filename='x86_SierraForest-v1.xml'/>
-       <include filename='x86_Denverton.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index fa7faa4016..9a1c048620 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -77,6 +77,7 @@ cpumap_data = [
-   'x86_EPYC.xml',
-   'x86_features.xml',
-   'x86_GraniteRapids-v1.xml',
-+  'x86_GraniteRapids-v2.xml',
-   'x86_GraniteRapids.xml',
-   'x86_Haswell-IBRS.xml',
-   'x86_Haswell-noTSX-IBRS.xml',
-diff --git a/src/cpu_map/x86_GraniteRapids-v2.xml b/src/cpu_map/x86_GraniteRapids-v2.xml
-new file mode 100644
-index 0000000000..855a43d4ad
---- /dev/null
-+++ b/src/cpu_map/x86_GraniteRapids-v2.xml
-@@ -0,0 +1,206 @@
-+<cpus>
-+  <model name='GraniteRapids-v2'>
-+    <decode host='on' guest='off'/>
-+    <signature family='6' model='173'/>
-+    <vendor name='Intel'/>
-+    <feature name='3dnowprefetch'/>
-+    <feature name='abm'/>
-+    <feature name='adx'/>
-+    <feature name='aes'/>
-+    <feature name='amx-bf16'/>
-+    <feature name='amx-fp16'/>
-+    <feature name='amx-int8'/>
-+    <feature name='amx-tile'/>
-+    <feature name='apic'/>
-+    <feature name='arat'/>
-+    <feature name='arch-capabilities'/>
-+    <feature name='avx'/>
-+    <feature name='avx-vnni'/>
-+    <feature name='avx10'/>
-+    <feature name='avx10-128'/>
-+    <feature name='avx10-256'/>
-+    <feature name='avx10-512'/>
-+    <feature name='avx2'/>
-+    <feature name='avx512-bf16'/>
-+    <feature name='avx512-fp16'/>
-+    <feature name='avx512-vpopcntdq'/>
-+    <feature name='avx512bitalg'/>
-+    <feature name='avx512bw'/>
-+    <feature name='avx512cd'/>
-+    <feature name='avx512dq'/>
-+    <feature name='avx512f'/>
-+    <feature name='avx512ifma'/>
-+    <feature name='avx512vbmi'/>
-+    <feature name='avx512vbmi2'/>
-+    <feature name='avx512vl'/>
-+    <feature name='avx512vnni'/>
-+    <feature name='bmi1'/>
-+    <feature name='bmi2'/>
-+    <feature name='bus-lock-detect'/>
-+    <feature name='cldemote'/>
-+    <feature name='clflush'/>
-+    <feature name='clflushopt'/>
-+    <feature name='clwb'/>
-+    <feature name='cmov'/>
-+    <feature name='cx16'/>
-+    <feature name='cx8'/>
-+    <feature name='de'/>
-+    <feature name='erms'/>
-+    <feature name='f16c'/>
-+    <feature name='fbsdp-no'/>
-+    <feature name='fma'/>
-+    <feature name='fpu'/>
-+    <feature name='fsgsbase'/>
-+    <feature name='fsrc'/>
-+    <feature name='fsrm'/>
-+    <feature name='fsrs'/>
-+    <feature name='fxsr'/>
-+    <feature name='fzrm'/>
-+    <feature name='gfni'/>
-+    <feature name='hle'/>
-+    <feature name='ibrs-all'/>
-+    <feature name='invpcid'/>
-+    <feature name='la57'/>
-+    <feature name='lahf_lm'/>
-+    <feature name='lm'/>
-+    <feature name='mca'/>
-+    <feature name='mcdt-no'/>
-+    <feature name='mce'/>
-+    <feature name='mds-no'/>
-+    <feature name='mmx'/>
-+    <feature name='movbe'/>
-+    <feature name='movdir64b'/>
-+    <feature name='movdiri'/>
-+    <feature name='msr'/>
-+    <feature name='mtrr'/>
-+    <feature name='nx'/>
-+    <feature name='pae'/>
-+    <feature name='pat'/>
-+    <feature name='pbrsb-no'/>
-+    <feature name='pcid'/>
-+    <feature name='pclmuldq'/>
-+    <feature name='pdpe1gb'/>
-+    <feature name='pge'/>
-+    <feature name='pku'/>
-+    <feature name='pni'/>
-+    <feature name='popcnt'/>
-+    <feature name='prefetchiti'/>
-+    <feature name='pschange-mc-no'/>
-+    <feature name='psdp-no'/>
-+    <feature name='pse'/>
-+    <feature name='pse36'/>
-+    <feature name='rdctl-no'/>
-+    <feature name='rdpid'/>
-+    <feature name='rdrand'/>
-+    <feature name='rdseed'/>
-+    <feature name='rdtscp'/>
-+    <feature name='rtm'/>
-+    <feature name='sbdr-ssdp-no'/>
-+    <feature name='sep'/>
-+    <feature name='serialize'/>
-+    <feature name='sha-ni'/>
-+    <feature name='skip-l1dfl-vmentry'/>
-+    <feature name='smap'/>
-+    <feature name='smep'/>
-+    <feature name='spec-ctrl'/>
-+    <feature name='ss'/>
-+    <feature name='ssbd'/>
-+    <feature name='sse'/>
-+    <feature name='sse2'/>
-+    <feature name='sse4.1'/>
-+    <feature name='sse4.2'/>
-+    <feature name='ssse3'/>
-+    <feature name='syscall'/>
-+    <feature name='taa-no'/>
-+    <feature name='tsc'/>
-+    <feature name='tsc-deadline'/>
-+    <feature name='tsc_adjust'/>
-+    <feature name='tsx-ldtrk'/>
-+    <feature name='umip'/>
-+    <feature name='vaes'/>
-+    <feature name='vme'/>
-+    <feature name='vmx-activity-hlt'/>
-+    <feature name='vmx-apicv-register'/>
-+    <feature name='vmx-apicv-vid'/>
-+    <feature name='vmx-apicv-x2apic'/>
-+    <feature name='vmx-apicv-xapic'/>
-+    <feature name='vmx-cr3-load-noexit'/>
-+    <feature name='vmx-cr3-store-noexit'/>
-+    <feature name='vmx-cr8-load-exit'/>
-+    <feature name='vmx-cr8-store-exit'/>
-+    <feature name='vmx-desc-exit'/>
-+    <feature name='vmx-entry-ia32e-mode'/>
-+    <feature name='vmx-entry-load-efer'/>
-+    <feature name='vmx-entry-load-pat'/>
-+    <feature name='vmx-entry-load-perf-global-ctrl'/>
-+    <feature name='vmx-entry-noload-debugctl'/>
-+    <feature name='vmx-ept'/>
-+    <feature name='vmx-ept-1gb'/>
-+    <feature name='vmx-ept-2mb'/>
-+    <feature name='vmx-ept-execonly'/>
-+    <feature name='vmx-eptad'/>
-+    <feature name='vmx-eptp-switching'/>
-+    <feature name='vmx-exit-ack-intr'/>
-+    <feature name='vmx-exit-load-efer'/>
-+    <feature name='vmx-exit-load-pat'/>
-+    <feature name='vmx-exit-load-perf-global-ctrl'/>
-+    <feature name='vmx-exit-nosave-debugctl'/>
-+    <feature name='vmx-exit-save-efer'/>
-+    <feature name='vmx-exit-save-pat'/>
-+    <feature name='vmx-exit-save-preemption-timer'/>
-+    <feature name='vmx-flexpriority'/>
-+    <feature name='vmx-hlt-exit'/>
-+    <feature name='vmx-ins-outs'/>
-+    <feature name='vmx-intr-exit'/>
-+    <feature name='vmx-invept'/>
-+    <feature name='vmx-invept-all-context'/>
-+    <feature name='vmx-invept-single-context'/>
-+    <feature name='vmx-invlpg-exit'/>
-+    <feature name='vmx-invpcid-exit'/>
-+    <feature name='vmx-invvpid-all-context'/>
-+    <feature name='vmx-invvpid-single-addr'/>
-+    <feature name='vmx-invvpid-single-context-noglobals'/>
-+    <feature name='vmx-io-bitmap'/>
-+    <feature name='vmx-io-exit'/>
-+    <feature name='vmx-monitor-exit'/>
-+    <feature name='vmx-movdr-exit'/>
-+    <feature name='vmx-msr-bitmap'/>
-+    <feature name='vmx-mtf'/>
-+    <feature name='vmx-mwait-exit'/>
-+    <feature name='vmx-nmi-exit'/>
-+    <feature name='vmx-page-walk-4'/>
-+    <feature name='vmx-page-walk-5'/>
-+    <feature name='vmx-pause-exit'/>
-+    <feature name='vmx-pml'/>
-+    <feature name='vmx-posted-intr'/>
-+    <feature name='vmx-preemption-timer'/>
-+    <feature name='vmx-rdpmc-exit'/>
-+    <feature name='vmx-rdrand-exit'/>
-+    <feature name='vmx-rdseed-exit'/>
-+    <feature name='vmx-rdtsc-exit'/>
-+    <feature name='vmx-rdtscp-exit'/>
-+    <feature name='vmx-secondary-ctls'/>
-+    <feature name='vmx-shadow-vmcs'/>
-+    <feature name='vmx-store-lma'/>
-+    <feature name='vmx-true-ctls'/>
-+    <feature name='vmx-tsc-offset'/>
-+    <feature name='vmx-unrestricted-guest'/>
-+    <feature name='vmx-vintr-pending'/>
-+    <feature name='vmx-vmfunc'/>
-+    <feature name='vmx-vmwrite-vmexit-fields'/>
-+    <feature name='vmx-vnmi'/>
-+    <feature name='vmx-vnmi-pending'/>
-+    <feature name='vmx-vpid'/>
-+    <feature name='vmx-wbinvd-exit'/>
-+    <feature name='vmx-xsaves'/>
-+    <feature name='vpclmulqdq'/>
-+    <feature name='wbnoinvd'/>
-+    <feature name='x2apic'/>
-+    <feature name='xfd'/>
-+    <feature name='xgetbv1'/>
-+    <feature name='xsave'/>
-+    <feature name='xsavec'/>
-+    <feature name='xsaveopt'/>
-+    <feature name='xsaves'/>
-+  </model>
-+</cpus>
-diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
-index e4d8862569..f1a7963d34 100644
---- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
-@@ -565,6 +565,63 @@
-         <feature name='xfd'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>GraniteRapids-v2</model>
-+      <blockers model='GraniteRapids-v2'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx10'/>
-+        <feature name='avx10-128'/>
-+        <feature name='avx10-256'/>
-+        <feature name='avx10-512'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cldemote'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ss'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
-       <blockers model='Haswell'>
-         <feature name='erms'/>
-diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
-index a21ed4997e..9a7d39c1f8 100644
---- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
-@@ -733,6 +733,53 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>GraniteRapids-v2</model>
-+      <blockers model='GraniteRapids-v2'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx10'/>
-+        <feature name='avx10-128'/>
-+        <feature name='avx10-256'/>
-+        <feature name='avx10-512'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cldemote'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='pcid'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='tsc_adjust'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
-       <blockers model='Haswell'>
-         <feature name='hle'/>
-diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
-index f4989749ce..64dc451eda 100644
---- a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
-@@ -564,6 +564,63 @@
-         <feature name='xfd'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>GraniteRapids-v2</model>
-+      <blockers model='GraniteRapids-v2'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx10'/>
-+        <feature name='avx10-128'/>
-+        <feature name='avx10-256'/>
-+        <feature name='avx10-512'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cldemote'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ss'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
-       <blockers model='Haswell'>
-         <feature name='erms'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 99445e5f44..d5db9af49e 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -565,6 +565,63 @@
-         <feature name='xfd'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>GraniteRapids-v2</model>
-+      <blockers model='GraniteRapids-v2'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx10'/>
-+        <feature name='avx10-128'/>
-+        <feature name='avx10-256'/>
-+        <feature name='avx10-512'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cldemote'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ss'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
-       <blockers model='Haswell'>
-         <feature name='erms'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 8bf967c99f..7ccdc11412 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -733,6 +733,53 @@
-         <feature name='xsavec'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>GraniteRapids-v2</model>
-+      <blockers model='GraniteRapids-v2'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx10'/>
-+        <feature name='avx10-128'/>
-+        <feature name='avx10-256'/>
-+        <feature name='avx10-512'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cldemote'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='pcid'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='tsc_adjust'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
-       <blockers model='Haswell'>
-         <feature name='hle'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 40aa971144..05a5ce4bee 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -564,6 +564,63 @@
-         <feature name='xfd'/>
-         <feature name='xsaves'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>GraniteRapids-v2</model>
-+      <blockers model='GraniteRapids-v2'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx10'/>
-+        <feature name='avx10-128'/>
-+        <feature name='avx10-256'/>
-+        <feature name='avx10-512'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cldemote'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ss'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
-       <blockers model='Haswell'>
-         <feature name='erms'/>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch
deleted file mode 100644
index bdd850e..0000000
--- a/SOURCES/libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch
+++ /dev/null
@@ -1,1417 +0,0 @@
-From b7570f7b0d6c1637c9f49a88a45fa3f4caf29d4e Mon Sep 17 00:00:00 2001
-Message-ID: <b7570f7b0d6c1637c9f49a88a45fa3f4caf29d4e.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:42:16 +0100
-Subject: [PATCH] cpu_map: Add KnightsMill-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 8f5e36cbce655086009bc906d63adcd50ddf8925)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                         |  1 +
- src/cpu_map/meson.build                       |  1 +
- src/cpu_map/x86_KnightsMill-v1.xml            |  6 ++++++
- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../qemu_7.2.0-tcg.x86_64+hvf.xml             | 16 ++++++++++++++-
- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml  | 16 ++++++++++++++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml  | 16 ++++++++++++++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml  | 14 ++++++++++++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml  | 14 ++++++++++++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml  | 13 +++++++++++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml  | 13 +++++++++++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml    | 14 ++++++++++++-
- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml  | 14 ++++++++++++-
- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml  | 13 +++++++++++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml    | 14 ++++++++++++-
- 43 files changed, 567 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_KnightsMill-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 16ebe36539..a0aa677dee 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -128,6 +128,7 @@
-       <include filename='x86_Denverton-v2.xml'/>
-       <include filename='x86_Denverton-v3.xml'/>
-       <include filename='x86_KnightsMill.xml'/>
-+      <include filename='x86_KnightsMill-v1.xml'/>
-     </group>
- 
-     <group name='AMD CPU models'>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 4d74431c55..70c7d2091b 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -99,6 +99,7 @@ cpumap_data = [
-   'x86_IvyBridge-v1.xml',
-   'x86_IvyBridge-v2.xml',
-   'x86_IvyBridge.xml',
-+  'x86_KnightsMill-v1.xml',
-   'x86_KnightsMill.xml',
-   'x86_kvm32-v1.xml',
-   'x86_kvm32.xml',
-diff --git a/src/cpu_map/x86_KnightsMill-v1.xml b/src/cpu_map/x86_KnightsMill-v1.xml
-new file mode 100644
-index 0000000000..00293d05b8
---- /dev/null
-+++ b/src/cpu_map/x86_KnightsMill-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='KnightsMill-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='KnightsMill'/>
-+  </model>
-+</cpus>
-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 efd8f06104..43e1ca8861 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -538,7 +538,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -550,6 +550,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 beb923a1f3..0718de04f7 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1021,7 +1021,7 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1039,6 +1039,24 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='avx2'/>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='rdseed'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='x2apic'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index d9ae5568be..6eb78e68f0 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -537,7 +537,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -549,6 +549,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 403b9f6674..3b716faf00 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -560,7 +560,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -572,6 +572,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 f2ad35c6cd..bd8c0a086c 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1111,7 +1111,7 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1129,6 +1129,24 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='avx2'/>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='rdseed'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='x2apic'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 07570f5b02..b6ec55cf0c 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -559,7 +559,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -571,6 +571,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 4cf841b3e9..e6615316f7 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -630,7 +630,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -642,6 +642,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 bbb9cfff7f..50d6395d7f 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1251,7 +1251,7 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1269,6 +1269,24 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='avx2'/>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='rdseed'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='x2apic'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 0c615f1802..974346f980 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -629,7 +629,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -641,6 +641,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 e468a90911..812ebd5e0a 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -627,7 +627,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -639,6 +639,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 b46a515864..24f22dd53f 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1248,7 +1248,7 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1266,6 +1266,24 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='avx2'/>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='rdseed'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='x2apic'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index d06e67a5e2..9af219d59d 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -626,7 +626,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -638,6 +638,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 a0c47fd84e..439f609233 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -654,7 +654,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -666,6 +666,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 db68047af7..53c114699c 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1277,7 +1277,7 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1295,6 +1295,24 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='avx2'/>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='rdseed'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='x2apic'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 71999ab677..6d91c4ac75 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -653,7 +653,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -665,6 +665,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 3a2874f08a..d61b339dd9 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -621,7 +621,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -633,6 +633,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 2416987852..a758fbabc5 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1225,7 +1225,7 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1243,6 +1243,24 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='avx2'/>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='rdseed'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='x2apic'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index eda271a1b2..48e8299c23 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -620,7 +620,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -632,6 +632,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 2b5cfdae87..6a15994158 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -626,7 +626,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -638,6 +638,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 6a191f3ce8..4d0def8fc7 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
-@@ -1010,7 +1010,7 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx512-4fmaps'/>
-@@ -1024,6 +1024,20 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='rdseed'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='x2apic'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 6a191f3ce8..4d0def8fc7 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1010,7 +1010,7 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx512-4fmaps'/>
-@@ -1024,6 +1024,20 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='rdseed'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='x2apic'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 48b4ced22f..ead8df9815 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -625,7 +625,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -637,6 +637,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 ec1fea19fc..1936c89c70 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -626,7 +626,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -638,6 +638,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 049bef7aa6..d72b0c93d3 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1009,7 +1009,7 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx512-4fmaps'/>
-@@ -1023,6 +1023,20 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='rdseed'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='x2apic'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 206a3a86a2..4adb6402ae 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -625,7 +625,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -637,6 +637,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 34fbc59118..c9f53064ff 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -804,7 +804,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -816,6 +816,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-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 2a836cbc21..b2e2c3264b 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1021,7 +1021,7 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -1033,6 +1033,18 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='x2apic'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 3380b8a9aa..c630356571 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -803,7 +803,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -815,6 +815,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index 0ec9ebeafe..17f4f6c4f0 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -805,7 +805,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -817,6 +817,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index b3fd8eb6c6..3ea2911762 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -996,7 +996,7 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -1008,6 +1008,18 @@
-         <feature name='tsc-deadline'/>
-         <feature name='x2apic'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='x2apic'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 210024bc44..77286e9aef 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -804,7 +804,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -816,6 +816,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 2aade71dae..d304fbd62b 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -805,7 +805,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -817,6 +817,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 36cec1ee6b..3e6cc25529 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -954,7 +954,7 @@
-         <feature name='spec-ctrl'/>
-         <feature name='tsc-deadline'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -965,6 +965,17 @@
-         <feature name='avx512pf'/>
-         <feature name='tsc-deadline'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 8316b40fce..a6fae9e3f1 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -804,7 +804,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -816,6 +816,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index cabd1c3694..060d96ab09 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -838,7 +838,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -850,6 +850,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 67a8a5f5e7..75f83cb376 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -979,7 +979,7 @@
-         <feature name='spec-ctrl'/>
-         <feature name='tsc-deadline'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -990,6 +990,17 @@
-         <feature name='avx512pf'/>
-         <feature name='tsc-deadline'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 45252b6b81..66dcb81fe6 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -837,7 +837,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -849,6 +849,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index cc5cbfbf19..72df5e5e7d 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -838,7 +838,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -850,6 +850,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index d0761a2c57..6a756782cd 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -979,7 +979,7 @@
-         <feature name='spec-ctrl'/>
-         <feature name='tsc-deadline'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -990,6 +990,17 @@
-         <feature name='avx512pf'/>
-         <feature name='tsc-deadline'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index df2f9d27ad..ef7b2bb67b 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -837,7 +837,7 @@
-         <feature name='erms'/>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>KnightsMill</model>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-       <blockers model='KnightsMill'>
-         <feature name='avx512-4fmaps'/>
-         <feature name='avx512-4vnniw'/>
-@@ -849,6 +849,18 @@
-         <feature name='erms'/>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-       <blockers model='Nehalem-IBRS'>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch
deleted file mode 100644
index 9abbd58..0000000
--- a/SOURCES/libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-From a16cad37582dc4641a63b9494c0c2e62b20cd8a5 Mon Sep 17 00:00:00 2001
-Message-ID: <a16cad37582dc4641a63b9494c0c2e62b20cd8a5.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:45:11 +0100
-Subject: [PATCH] cpu_map: Add Opteron_G1-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit a1625b73f6408918a3a5b07572b21d5bbb5f2fbd)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_Opteron_G1-v1.xml                  | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
- 43 files changed, 88 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_Opteron_G1-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 74b315c661..4cf884e778 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -137,6 +137,7 @@
-       <include filename='x86_phenom.xml'/>
-       <include filename='x86_phenom-v1.xml'/>
-       <include filename='x86_Opteron_G1.xml'/>
-+      <include filename='x86_Opteron_G1-v1.xml'/>
-       <include filename='x86_Opteron_G2.xml'/>
-       <include filename='x86_Opteron_G3.xml'/>
-       <include filename='x86_Opteron_G4.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 47c93deace..8385c89552 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -112,6 +112,7 @@ cpumap_data = [
-   'x86_Nehalem-v1.xml',
-   'x86_Nehalem-v2.xml',
-   'x86_Nehalem.xml',
-+  'x86_Opteron_G1-v1.xml',
-   'x86_Opteron_G1.xml',
-   'x86_Opteron_G2.xml',
-   'x86_Opteron_G3.xml',
-diff --git a/src/cpu_map/x86_Opteron_G1-v1.xml b/src/cpu_map/x86_Opteron_G1-v1.xml
-new file mode 100644
-index 0000000000..b040da4dea
---- /dev/null
-+++ b/src/cpu_map/x86_Opteron_G1-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='Opteron_G1-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='Opteron_G1'/>
-+  </model>
-+</cpus>
-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 27d36feccf..d12aa0d569 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -572,7 +572,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 b06febb821..2aabe77417 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1067,7 +1067,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 21b4ab8c5c..743262e1a0 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -571,7 +571,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 83bb914c7d..b15ba4ebb6 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -594,7 +594,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 47ab7240fb..38b2861714 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1157,7 +1157,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index cc212722f5..01a0eb2f47 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -593,7 +593,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 ec7abc3903..ac184c5075 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -664,7 +664,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 87fe22edd7..02b362c722 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1297,7 +1297,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 35bba84033..00b61e4380 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -663,7 +663,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 b448d7bdb8..dc82ce2aa9 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -661,7 +661,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 a8a96f2bb4..1a016f7379 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1294,7 +1294,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 303b714aa7..b5389e8a3f 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -660,7 +660,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 9da8e156e2..ccb8bb7f7b 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -688,7 +688,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 a5b9edaeb6..e0e53e543d 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1323,7 +1323,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 3029403bac..980c296c18 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -687,7 +687,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 259613d7fe..10d31b6007 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -655,7 +655,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 d3ecad143c..e916f523ac 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1271,7 +1271,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 7f08dd995d..434fa7bd95 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -654,7 +654,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 1057fc58d3..80497c5125 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -660,7 +660,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 fa4e9cfb8c..e67ae9b280 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
-@@ -1048,7 +1048,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-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 fa4e9cfb8c..e67ae9b280 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1048,7 +1048,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 0c0f363d2b..e0a1209cea 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -659,7 +659,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 b1de96fadd..03c40996e1 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -660,7 +660,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 c83819435d..3d52b5fda0 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1047,7 +1047,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 8f195f0e39..8c84a54239 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -659,7 +659,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 5495883fe9..dcce5a827f 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -838,7 +838,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-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 87fc57da66..d086460c7d 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1055,7 +1055,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 43703fefab..19ff721d09 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -837,7 +837,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index 2eab4e49b1..c09f4c56bf 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -839,7 +839,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 08b45ba90b..13c2cc5439 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1030,7 +1030,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 28b233d35d..bd6c173c04 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -838,7 +838,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 16a3cdacb5..f644b1ac5c 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -839,7 +839,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 549e21c273..2107e5b7be 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -986,7 +986,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 16e0d61c51..5cf479694e 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -838,7 +838,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 2b33304882..5c52c08ee7 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -872,7 +872,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index f91fcdd4e5..1d41d3ef8c 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1011,7 +1011,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 82fe2b3b1a..dfb6f741c4 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -871,7 +871,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 0c896766cb..c711064a04 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -872,7 +872,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 94c6914767..caf86d2c2b 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1011,7 +1011,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 1f73e3903c..16a34ed042 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -871,7 +871,8 @@
-       <blockers model='Nehalem-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch
deleted file mode 100644
index 8669e31..0000000
--- a/SOURCES/libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-From d70b69c794be4bcda17250c0101772bd2ffd2996 Mon Sep 17 00:00:00 2001
-Message-ID: <d70b69c794be4bcda17250c0101772bd2ffd2996.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:47:52 +0100
-Subject: [PATCH] cpu_map: Add Opteron_G2-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 51ffa44fb4242bd6c6610271a6c45d2c3672a55d)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_Opteron_G2-v1.xml                  | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
- 43 files changed, 88 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_Opteron_G2-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 4cf884e778..0070796dee 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -139,6 +139,7 @@
-       <include filename='x86_Opteron_G1.xml'/>
-       <include filename='x86_Opteron_G1-v1.xml'/>
-       <include filename='x86_Opteron_G2.xml'/>
-+      <include filename='x86_Opteron_G2-v1.xml'/>
-       <include filename='x86_Opteron_G3.xml'/>
-       <include filename='x86_Opteron_G4.xml'/>
-       <include filename='x86_Opteron_G5.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 8385c89552..fb6494a14a 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -114,6 +114,7 @@ cpumap_data = [
-   'x86_Nehalem.xml',
-   'x86_Opteron_G1-v1.xml',
-   'x86_Opteron_G1.xml',
-+  'x86_Opteron_G2-v1.xml',
-   'x86_Opteron_G2.xml',
-   'x86_Opteron_G3.xml',
-   'x86_Opteron_G4.xml',
-diff --git a/src/cpu_map/x86_Opteron_G2-v1.xml b/src/cpu_map/x86_Opteron_G2-v1.xml
-new file mode 100644
-index 0000000000..8f0a05f37c
---- /dev/null
-+++ b/src/cpu_map/x86_Opteron_G2-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='Opteron_G2-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='Opteron_G2'/>
-+  </model>
-+</cpus>
-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 d12aa0d569..8f0b9b3bff 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -574,7 +574,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 2aabe77417..b4f2c700f9 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1069,7 +1069,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 743262e1a0..bd3095fec9 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -573,7 +573,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 b15ba4ebb6..b426bd1e63 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -596,7 +596,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 38b2861714..d89a9b2c32 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1159,7 +1159,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 01a0eb2f47..a8773fb4f7 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -595,7 +595,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 ac184c5075..de1f78b335 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -666,7 +666,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 02b362c722..581afc86a0 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1299,7 +1299,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 00b61e4380..53d83980a6 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -665,7 +665,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 dc82ce2aa9..77eab8aa95 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -663,7 +663,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 1a016f7379..710866e495 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1296,7 +1296,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index b5389e8a3f..99fe26dc76 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -662,7 +662,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 ccb8bb7f7b..eab56f9a7c 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -690,7 +690,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 e0e53e543d..e5b4cff7c6 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1325,7 +1325,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 980c296c18..6ec56068bd 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -689,7 +689,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 10d31b6007..0e27b3400c 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -657,7 +657,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 e916f523ac..e588593d91 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1273,7 +1273,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 434fa7bd95..7cb9663805 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -656,7 +656,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 80497c5125..c66731ceac 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -662,7 +662,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 e67ae9b280..ec61c328c9 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
-@@ -1050,7 +1050,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-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 e67ae9b280..ec61c328c9 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1050,7 +1050,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index e0a1209cea..8fd837d2c4 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -661,7 +661,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 03c40996e1..2a78fe6926 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -662,7 +662,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 3d52b5fda0..cb7bb1513c 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1049,7 +1049,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 8c84a54239..7c66d893ae 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -661,7 +661,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 dcce5a827f..1d23c25196 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -840,7 +840,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-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 d086460c7d..768769a4ef 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1057,7 +1057,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 19ff721d09..95106cfeab 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -839,7 +839,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index c09f4c56bf..5b777b730b 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -841,7 +841,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 13c2cc5439..0ea4c2cdb8 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1032,7 +1032,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index bd6c173c04..506b949225 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -840,7 +840,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index f644b1ac5c..d84324eac6 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -841,7 +841,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 2107e5b7be..cccf48aafb 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -988,7 +988,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 5cf479694e..05c06c9b25 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -840,7 +840,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 5c52c08ee7..e295c808d7 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -874,7 +874,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 1d41d3ef8c..8b338c75be 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1013,7 +1013,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index dfb6f741c4..6b2c1f15b5 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -873,7 +873,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index c711064a04..ab82a874b1 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -874,7 +874,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index caf86d2c2b..bf20e3d536 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1013,7 +1013,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 16a34ed042..d28d4c1f14 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -873,7 +873,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch
deleted file mode 100644
index 4531999..0000000
--- a/SOURCES/libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch
+++ /dev/null
@@ -1,768 +0,0 @@
-From d46a39eb87ab713ef82982ed9578ab1e5e826237 Mon Sep 17 00:00:00 2001
-Message-ID: <d46a39eb87ab713ef82982ed9578ab1e5e826237.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:48:47 +0100
-Subject: [PATCH] cpu_map: Add Opteron_G3-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 422d90dc56d34879e6f52f34516c92dfc7f286fa)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                                | 1 +
- src/cpu_map/meson.build                              | 1 +
- src/cpu_map/x86_Opteron_G3-v1.xml                    | 6 ++++++
- tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml | 2 +-
- tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml | 2 +-
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml   | 6 +++++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml           | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml       | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml       | 6 +++++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml           | 3 ++-
- 45 files changed, 132 insertions(+), 42 deletions(-)
- create mode 100644 src/cpu_map/x86_Opteron_G3-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 0070796dee..cdb8a568a6 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -141,6 +141,7 @@
-       <include filename='x86_Opteron_G2.xml'/>
-       <include filename='x86_Opteron_G2-v1.xml'/>
-       <include filename='x86_Opteron_G3.xml'/>
-+      <include filename='x86_Opteron_G3-v1.xml'/>
-       <include filename='x86_Opteron_G4.xml'/>
-       <include filename='x86_Opteron_G5.xml'/>
-       <include filename='x86_EPYC.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index fb6494a14a..d735c54fd6 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -116,6 +116,7 @@ cpumap_data = [
-   'x86_Opteron_G1.xml',
-   'x86_Opteron_G2-v1.xml',
-   'x86_Opteron_G2.xml',
-+  'x86_Opteron_G3-v1.xml',
-   'x86_Opteron_G3.xml',
-   'x86_Opteron_G4.xml',
-   'x86_Opteron_G5.xml',
-diff --git a/src/cpu_map/x86_Opteron_G3-v1.xml b/src/cpu_map/x86_Opteron_G3-v1.xml
-new file mode 100644
-index 0000000000..8a625c5b1f
---- /dev/null
-+++ b/src/cpu_map/x86_Opteron_G3-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='Opteron_G3-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='Opteron_G3'/>
-+  </model>
-+</cpus>
-diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
-index 53b98713e5..87aee9febe 100644
---- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Opteron_G3</model>
-+  <model>Opteron_G3-v1</model>
-   <vendor>AMD</vendor>
-   <signature family='16' model='2' stepping='3'/>
-   <feature name='monitor'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
-index 53b98713e5..87aee9febe 100644
---- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Opteron_G3</model>
-+  <model>Opteron_G3-v1</model>
-   <vendor>AMD</vendor>
-   <signature family='16' model='2' stepping='3'/>
-   <feature name='monitor'/>
-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 8f0b9b3bff..f673f670a0 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -576,7 +576,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 b4f2c700f9..6a3af31956 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1071,10 +1071,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index bd3095fec9..f0f6303099 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -575,7 +575,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 b426bd1e63..24f2c91022 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -598,7 +598,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 d89a9b2c32..111613d0b8 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1161,10 +1161,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index a8773fb4f7..82dbca5341 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -597,7 +597,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 de1f78b335..a869314868 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -668,7 +668,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 581afc86a0..660744d28c 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1301,10 +1301,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 53d83980a6..8bc739091e 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -667,7 +667,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 77eab8aa95..a3014c8142 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -665,7 +665,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 710866e495..b4d902b44c 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1298,10 +1298,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 99fe26dc76..2e9bc75e1f 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -664,7 +664,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 eab56f9a7c..8a6379b7b9 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -692,7 +692,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 e5b4cff7c6..02a5887255 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1327,10 +1327,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 6ec56068bd..7168fb805a 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -691,7 +691,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 0e27b3400c..93373fbe5b 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -659,7 +659,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 e588593d91..890164b50a 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1275,10 +1275,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 7cb9663805..1c0a102063 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -658,7 +658,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 c66731ceac..6348bf9eb9 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -664,7 +664,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 ec61c328c9..dc9a0cc4b2 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
-@@ -1052,10 +1052,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-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 ec61c328c9..dc9a0cc4b2 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1052,10 +1052,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 8fd837d2c4..70c15a677a 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -663,7 +663,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 2a78fe6926..875f902101 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -664,7 +664,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 cb7bb1513c..52324024a0 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1051,10 +1051,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 7c66d893ae..6291c3c303 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -663,7 +663,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 1d23c25196..cc248936df 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -842,7 +842,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-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 768769a4ef..b1e820ea61 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1059,10 +1059,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 95106cfeab..c3cd328dea 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -841,7 +841,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index 5b777b730b..5dbfe76dd8 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -843,7 +843,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 0ea4c2cdb8..a51e57f66d 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1034,10 +1034,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 506b949225..dfc98e58f0 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -842,7 +842,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index d84324eac6..9c21297cec 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -843,7 +843,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index cccf48aafb..81c404727c 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -990,10 +990,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 05c06c9b25..744280a43a 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -842,7 +842,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index e295c808d7..3b5ee6ec78 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -876,7 +876,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 8b338c75be..9091305bb5 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1015,10 +1015,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 6b2c1f15b5..330e9748b9 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -875,7 +875,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index ab82a874b1..adf0140fc2 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -876,7 +876,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index bf20e3d536..93efe9253b 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1015,10 +1015,14 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G3</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <blockers model='Opteron_G3'>
-         <feature name='misalignsse'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index d28d4c1f14..e2e11f239f 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -875,7 +875,8 @@
-       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
--      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-       <model usable='no' vendor='AMD'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch
deleted file mode 100644
index 6079d84..0000000
--- a/SOURCES/libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch
+++ /dev/null
@@ -1,1097 +0,0 @@
-From bfeef75f78413d6aff187dedd490781501dfef36 Mon Sep 17 00:00:00 2001
-Message-ID: <bfeef75f78413d6aff187dedd490781501dfef36.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:49:46 +0100
-Subject: [PATCH] cpu_map: Add Opteron_G4-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit d092730fb4e629ec87c45e7a4340ae63c853556c)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                                |  1 +
- src/cpu_map/meson.build                              |  1 +
- src/cpu_map/x86_Opteron_G4-v1.xml                    |  6 ++++++
- tests/cputestdata/x86_64-cpuid-FX-8150-host.xml      |  2 +-
- tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml |  2 +-
- tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml |  2 +-
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml       | 11 ++++++++++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml       | 11 ++++++++++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml       | 11 ++++++++++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml       | 11 ++++++++++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml       | 11 ++++++++++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml       | 11 ++++++++++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml   | 10 +++++++++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml       | 10 +++++++++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml       | 10 +++++++++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml       |  9 ++++++++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml       |  9 ++++++++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml       |  9 ++++++++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml       |  9 ++++++++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml           |  7 ++++++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml       |  7 ++++++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml       |  9 ++++++++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml           |  7 ++++++-
- 46 files changed, 294 insertions(+), 43 deletions(-)
- create mode 100644 src/cpu_map/x86_Opteron_G4-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index cdb8a568a6..40be965c36 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -143,6 +143,7 @@
-       <include filename='x86_Opteron_G3.xml'/>
-       <include filename='x86_Opteron_G3-v1.xml'/>
-       <include filename='x86_Opteron_G4.xml'/>
-+      <include filename='x86_Opteron_G4-v1.xml'/>
-       <include filename='x86_Opteron_G5.xml'/>
-       <include filename='x86_EPYC.xml'/>
-       <include filename='x86_EPYC-IBPB.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index d735c54fd6..b1bff43d1a 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -118,6 +118,7 @@ cpumap_data = [
-   'x86_Opteron_G2.xml',
-   'x86_Opteron_G3-v1.xml',
-   'x86_Opteron_G3.xml',
-+  'x86_Opteron_G4-v1.xml',
-   'x86_Opteron_G4.xml',
-   'x86_Opteron_G5.xml',
-   'x86_Penryn-v1.xml',
-diff --git a/src/cpu_map/x86_Opteron_G4-v1.xml b/src/cpu_map/x86_Opteron_G4-v1.xml
-new file mode 100644
-index 0000000000..e89c93948d
---- /dev/null
-+++ b/src/cpu_map/x86_Opteron_G4-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='Opteron_G4-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='Opteron_G4'/>
-+  </model>
-+</cpus>
-diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
-index d8c6a8ac0f..9549fa1507 100644
---- a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Opteron_G4</model>
-+  <model>Opteron_G4-v1</model>
-   <vendor>AMD</vendor>
-   <signature family='21' model='1' stepping='2'/>
-   <feature name='monitor'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
-index d8c6a8ac0f..9549fa1507 100644
---- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Opteron_G4</model>
-+  <model>Opteron_G4-v1</model>
-   <vendor>AMD</vendor>
-   <signature family='21' model='1' stepping='2'/>
-   <feature name='monitor'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
-index d8c6a8ac0f..9549fa1507 100644
---- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Opteron_G4</model>
-+  <model>Opteron_G4-v1</model>
-   <vendor>AMD</vendor>
-   <signature family='21' model='1' stepping='2'/>
-   <feature name='monitor'/>
-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 f673f670a0..48303b17e1 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -578,11 +578,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 6a3af31956..bc8fd8b7e8 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1079,7 +1079,7 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1088,6 +1088,15 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index f0f6303099..a149caaac7 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -577,11 +577,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 24f2c91022..342e2b3ccd 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -600,11 +600,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 111613d0b8..ddf0080cc1 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1169,7 +1169,7 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1178,6 +1178,15 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 82dbca5341..79a282c065 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -599,11 +599,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 a869314868..edabb37ead 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -670,11 +670,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 660744d28c..801fddf93a 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1309,7 +1309,7 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1318,6 +1318,15 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 8bc739091e..386083131c 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -669,11 +669,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 a3014c8142..12aa247563 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -667,11 +667,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 b4d902b44c..8eaadfd389 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1306,7 +1306,7 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1315,6 +1315,15 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 2e9bc75e1f..5744c2cbbf 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -666,11 +666,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 8a6379b7b9..7129b49670 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -694,11 +694,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 02a5887255..e10973b629 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1335,7 +1335,7 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1344,6 +1344,15 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 7168fb805a..98cf875d10 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -693,11 +693,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 93373fbe5b..7617177578 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -661,11 +661,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 890164b50a..6d1b777442 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1283,7 +1283,7 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1292,6 +1292,15 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 1c0a102063..95b3476116 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -660,11 +660,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 6348bf9eb9..fe591e6644 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -666,11 +666,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 dc9a0cc4b2..6e6eb8d57c 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
-@@ -1060,7 +1060,7 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-         <feature name='fma4'/>
-@@ -1068,6 +1068,14 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-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 dc9a0cc4b2..6e6eb8d57c 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1060,7 +1060,7 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-         <feature name='fma4'/>
-@@ -1068,6 +1068,14 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 70c15a677a..3568c4011b 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -665,11 +665,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 875f902101..3846d633c1 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -666,11 +666,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 52324024a0..1983d5e635 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1059,7 +1059,7 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='3dnowprefetch'/>
-         <feature name='fma4'/>
-@@ -1067,6 +1067,14 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 6291c3c303..0fd169dda6 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -665,11 +665,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 cc248936df..2f1ef6b196 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -844,11 +844,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-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 b1e820ea61..816891f303 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1067,13 +1067,20 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='misalignsse'/>
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index c3cd328dea..6bf06dd445 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -843,11 +843,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index 5dbfe76dd8..b4258868aa 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -845,11 +845,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index a51e57f66d..fc92315651 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1042,13 +1042,20 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='misalignsse'/>
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index dfc98e58f0..2b33577cec 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -844,11 +844,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 9c21297cec..85216b05a4 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -845,11 +845,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 81c404727c..8cf49e42f8 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -998,13 +998,20 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='misalignsse'/>
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 744280a43a..6570359797 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -844,11 +844,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 3b5ee6ec78..b7aa3acedd 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -878,11 +878,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 9091305bb5..fbcae333c6 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1023,13 +1023,20 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='misalignsse'/>
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 330e9748b9..65f4238125 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -877,11 +877,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index adf0140fc2..21f38b8f2f 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -878,11 +878,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 93efe9253b..5071762544 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1023,13 +1023,20 @@
-       <blockers model='Opteron_G3-v1'>
-         <feature name='misalignsse'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='misalignsse'/>
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index e2e11f239f..e3391a74bf 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -877,11 +877,16 @@
-       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-       <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-       <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
--      <model usable='no' vendor='AMD'>Opteron_G4</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-       <blockers model='Opteron_G4'>
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='no' vendor='AMD'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch
deleted file mode 100644
index e916411..0000000
--- a/SOURCES/libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch
+++ /dev/null
@@ -1,1154 +0,0 @@
-From d32138717aa3212542a788a4824a832766cedd51 Mon Sep 17 00:00:00 2001
-Message-ID: <d32138717aa3212542a788a4824a832766cedd51.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 16:01:20 +0100
-Subject: [PATCH] cpu_map: Add Opteron_G5-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 9bc479a3c0e0453e50ceb149abc41c5787e61735)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              |  1 +
- src/cpu_map/meson.build                            |  1 +
- src/cpu_map/x86_Opteron_G5-v1.xml                  |  6 ++++++
- tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml  |  2 +-
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 14 +++++++++++++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 14 +++++++++++++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 14 +++++++++++++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 14 +++++++++++++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 14 +++++++++++++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 14 +++++++++++++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 11 ++++++++++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 11 ++++++++++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 11 ++++++++++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 10 +++++++++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 10 +++++++++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 10 +++++++++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 10 +++++++++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         |  8 +++++++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     |  8 +++++++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 10 +++++++++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         |  8 +++++++-
- 44 files changed, 344 insertions(+), 41 deletions(-)
- create mode 100644 src/cpu_map/x86_Opteron_G5-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 40be965c36..9bd90cc83b 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -145,6 +145,7 @@
-       <include filename='x86_Opteron_G4.xml'/>
-       <include filename='x86_Opteron_G4-v1.xml'/>
-       <include filename='x86_Opteron_G5.xml'/>
-+      <include filename='x86_Opteron_G5-v1.xml'/>
-       <include filename='x86_EPYC.xml'/>
-       <include filename='x86_EPYC-IBPB.xml'/>
-       <include filename='x86_EPYC-v1.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index b1bff43d1a..5ac3c82dc7 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -120,6 +120,7 @@ cpumap_data = [
-   'x86_Opteron_G3.xml',
-   'x86_Opteron_G4-v1.xml',
-   'x86_Opteron_G4.xml',
-+  'x86_Opteron_G5-v1.xml',
-   'x86_Opteron_G5.xml',
-   'x86_Penryn-v1.xml',
-   'x86_Penryn.xml',
-diff --git a/src/cpu_map/x86_Opteron_G5-v1.xml b/src/cpu_map/x86_Opteron_G5-v1.xml
-new file mode 100644
-index 0000000000..7e0f16775e
---- /dev/null
-+++ b/src/cpu_map/x86_Opteron_G5-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='Opteron_G5-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='Opteron_G5'/>
-+  </model>
-+</cpus>
-diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
-index e4a455df15..738e8ea67a 100644
---- a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Opteron_G5</model>
-+  <model>Opteron_G5-v1</model>
-   <vendor>AMD</vendor>
-   <signature family='21' model='16' stepping='1'/>
-   <feature name='monitor'/>
-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 48303b17e1..ce3ba14684 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -588,12 +588,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 bc8fd8b7e8..92827056db 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1097,7 +1097,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1109,6 +1109,18 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index a149caaac7..21e8a55a63 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -587,12 +587,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 342e2b3ccd..ba09a6cbb2 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -610,12 +610,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 ddf0080cc1..dc15afa017 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1187,7 +1187,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1199,6 +1199,18 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 79a282c065..72ceb31595 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -609,12 +609,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 edabb37ead..deaa3a0041 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -680,12 +680,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 801fddf93a..469752cf32 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1327,7 +1327,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1339,6 +1339,18 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 386083131c..7484c13f2c 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -679,12 +679,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 12aa247563..d1a8399812 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -677,12 +677,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 8eaadfd389..8c8f016233 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1324,7 +1324,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1336,6 +1336,18 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 5744c2cbbf..1f21b8be4e 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -676,12 +676,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 7129b49670..2c5129453e 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -704,12 +704,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 e10973b629..d4a567f5c6 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1353,7 +1353,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1365,6 +1365,18 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 98cf875d10..6fa08af994 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -703,12 +703,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 7617177578..8bed31ad22 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -671,12 +671,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 6d1b777442..cb7fd8811b 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1301,7 +1301,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-         <feature name='avx'/>
-@@ -1313,6 +1313,18 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='avx'/>
-+        <feature name='f16c'/>
-+        <feature name='fma'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 95b3476116..a0f8b13f72 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -670,12 +670,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 fe591e6644..f9d27024fc 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -676,12 +676,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 6e6eb8d57c..c7728ac454 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
-@@ -1076,7 +1076,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-         <feature name='fma4'/>
-@@ -1085,6 +1085,15 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 6e6eb8d57c..c7728ac454 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1076,7 +1076,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-         <feature name='fma4'/>
-@@ -1085,6 +1085,15 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 3568c4011b..f0d9493353 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -675,12 +675,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 3846d633c1..b8c376cb14 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -676,12 +676,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 1983d5e635..d3c9830a1a 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1075,7 +1075,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='3dnowprefetch'/>
-         <feature name='fma4'/>
-@@ -1084,6 +1084,15 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='3dnowprefetch'/>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 0fd169dda6..e8df30ae07 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -675,12 +675,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 2f1ef6b196..197efcbe59 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -854,12 +854,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-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 816891f303..07fdd0c3a3 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1081,7 +1081,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='misalignsse'/>
-@@ -1089,6 +1089,14 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 6bf06dd445..ec95c1a2ac 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -853,12 +853,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index b4258868aa..d1d330df87 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -855,12 +855,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index fc92315651..75cb1b8f17 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1056,7 +1056,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='misalignsse'/>
-@@ -1064,6 +1064,14 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 2b33577cec..5f6e72e7ca 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -854,12 +854,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 85216b05a4..3c005d0c10 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -855,12 +855,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 8cf49e42f8..3a6424eddf 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1012,7 +1012,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='misalignsse'/>
-@@ -1020,6 +1020,14 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 6570359797..79c39678ca 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -854,12 +854,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index b7aa3acedd..117947ef13 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -888,12 +888,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index fbcae333c6..c2c244f464 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1037,7 +1037,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='misalignsse'/>
-@@ -1045,6 +1045,14 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 65f4238125..30959cd723 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -887,12 +887,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 21f38b8f2f..5fc9576495 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -888,12 +888,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 5071762544..eeba43f9fa 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1037,7 +1037,7 @@
-         <feature name='nrip-save'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='misalignsse'/>
-@@ -1045,6 +1045,14 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index e3391a74bf..96d789ee1c 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -887,12 +887,18 @@
-         <feature name='fma4'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>Opteron_G5</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-       <blockers model='Opteron_G5'>
-         <feature name='fma4'/>
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-       <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch
deleted file mode 100644
index 0cbcb64..0000000
--- a/SOURCES/libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch
+++ /dev/null
@@ -1,684 +0,0 @@
-From 8eb51b4d75eccc4ba1d2f812a9ff13cb3953c22a Mon Sep 17 00:00:00 2001
-Message-ID: <8eb51b4d75eccc4ba1d2f812a9ff13cb3953c22a.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:41:18 +0100
-Subject: [PATCH] cpu_map: Add Penryn-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 537f136549ea9c02642b6114c540c6cb1276ed6e)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                               | 1 +
- src/cpu_map/meson.build                             | 1 +
- src/cpu_map/x86_Penryn-v1.xml                       | 6 ++++++
- tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml | 2 +-
- tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml  | 2 +-
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml  | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml          | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml      | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml          | 3 ++-
- 45 files changed, 90 insertions(+), 42 deletions(-)
- create mode 100644 src/cpu_map/x86_Penryn-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index e9a180526e..16ebe36539 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -41,6 +41,7 @@
-       <include filename='x86_Conroe.xml'/>
-       <include filename='x86_Conroe-v1.xml'/>
-       <include filename='x86_Penryn.xml'/>
-+      <include filename='x86_Penryn-v1.xml'/>
-       <include filename='x86_Nehalem.xml'/>
-       <include filename='x86_Nehalem-IBRS.xml'/>
-       <include filename='x86_Nehalem-v1.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index cbf7bb407b..4d74431c55 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -115,6 +115,7 @@ cpumap_data = [
-   'x86_Opteron_G3.xml',
-   'x86_Opteron_G4.xml',
-   'x86_Opteron_G5.xml',
-+  'x86_Penryn-v1.xml',
-   'x86_Penryn.xml',
-   'x86_pentium-v1.xml',
-   'x86_pentium.xml',
-diff --git a/src/cpu_map/x86_Penryn-v1.xml b/src/cpu_map/x86_Penryn-v1.xml
-new file mode 100644
-index 0000000000..5da70a233e
---- /dev/null
-+++ b/src/cpu_map/x86_Penryn-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='Penryn-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='Penryn'/>
-+  </model>
-+</cpus>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
-index dac84ba5fc..5034355859 100644
---- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Penryn</model>
-+  <model>Penryn-v1</model>
-   <vendor>Intel</vendor>
-   <signature family='6' model='23' stepping='10'/>
-   <feature name='dtes64'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
-index b7bc4cbb5b..a0516e6652 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Penryn</model>
-+  <model>Penryn-v1</model>
-   <vendor>Intel</vendor>
-   <signature family='6' model='23' stepping='6'/>
-   <feature name='dtes64'/>
-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 3a14131fda..efd8f06104 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -574,7 +574,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 5223402151..beb923a1f3 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1076,7 +1076,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='avx'/>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index a3638c64a4..d9ae5568be 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -573,7 +573,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 9af3b3768d..403b9f6674 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -596,7 +596,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 7932c25f39..f2ad35c6cd 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1166,7 +1166,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='avx'/>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 72c598466a..07570f5b02 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -595,7 +595,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 b3ba5b020d..4cf841b3e9 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -666,7 +666,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 69a73ea9b2..bbb9cfff7f 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1306,7 +1306,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='avx'/>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 54edabd43f..0c615f1802 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -665,7 +665,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 be908c6cc6..e468a90911 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -663,7 +663,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 8fb08191ea..b46a515864 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1303,7 +1303,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='avx'/>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 1f9bdf36af..d06e67a5e2 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -662,7 +662,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 14081dfafd..a0c47fd84e 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -690,7 +690,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 d9ba0202bd..db68047af7 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1332,7 +1332,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='avx'/>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index bba1b69e41..71999ab677 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -689,7 +689,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 9fb0fbe581..3a2874f08a 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -657,7 +657,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 b7f01c2b58..2416987852 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1280,7 +1280,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='avx'/>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index f7e9853077..eda271a1b2 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -656,7 +656,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 4b670c95fe..2b5cfdae87 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -662,7 +662,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 8b85bd98b4..6a191f3ce8 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
-@@ -1057,7 +1057,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='tsc-deadline'/>
-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 8b85bd98b4..6a191f3ce8 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1057,7 +1057,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='tsc-deadline'/>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 0e1328f1fc..48b4ced22f 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -661,7 +661,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 b3040a9e6e..ec1fea19fc 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -662,7 +662,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 ac533cccfa..049bef7aa6 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1056,7 +1056,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='tsc-deadline'/>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 0558eb7588..206a3a86a2 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -661,7 +661,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 3b334589ed..34fbc59118 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -840,7 +840,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-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 9815a01beb..2a836cbc21 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1064,7 +1064,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='tsc-deadline'/>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 3b1796949f..3380b8a9aa 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -839,7 +839,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index c4d2a768bd..0ec9ebeafe 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -841,7 +841,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 207092ba7b..b3fd8eb6c6 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1039,7 +1039,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='tsc-deadline'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 855dfef498..210024bc44 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -840,7 +840,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index f7ddcd9aff..2aade71dae 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -841,7 +841,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 3419e26d32..36cec1ee6b 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -996,7 +996,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='tsc-deadline'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 43bc77f7cc..8316b40fce 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -840,7 +840,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 0a962420cd..cabd1c3694 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -874,7 +874,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 02209df41b..67a8a5f5e7 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1021,7 +1021,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='tsc-deadline'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 49e1df7be4..45252b6b81 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -873,7 +873,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 56449ad3db..cc5cbfbf19 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -874,7 +874,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 04a759a16b..d0761a2c57 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1021,7 +1021,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <blockers model='SandyBridge'>
-         <feature name='tsc-deadline'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 7b3379b3e5..df2f9d27ad 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -873,7 +873,8 @@
-         <feature name='tbm'/>
-         <feature name='xop'/>
-       </blockers>
--      <model usable='yes' vendor='Intel'>Penryn</model>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-       <blockers model='SandyBridge-IBRS'>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-athlon-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-athlon-v1-CPU-model.patch
deleted file mode 100644
index 116a530..0000000
--- a/SOURCES/libvirt-cpu_map-Add-athlon-v1-CPU-model.patch
+++ /dev/null
@@ -1,879 +0,0 @@
-From 74bf67730d74babf7f32e3c3328eb64a980fb0dc Mon Sep 17 00:00:00 2001
-Message-ID: <74bf67730d74babf7f32e3c3328eb64a980fb0dc.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:43:25 +0100
-Subject: [PATCH] cpu_map: Add athlon-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 6b775a68ec90595c2a0892c70985ca0784f87c10)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_athlon-v1.xml                      | 6 ++++++
- tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml | 2 +-
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 7 ++++++-
- 44 files changed, 193 insertions(+), 41 deletions(-)
- create mode 100644 src/cpu_map/x86_athlon-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index a0aa677dee..5f42fdc7fd 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -133,6 +133,7 @@
- 
-     <group name='AMD CPU models'>
-       <include filename='x86_athlon.xml'/>
-+      <include filename='x86_athlon-v1.xml'/>
-       <include filename='x86_phenom.xml'/>
-       <include filename='x86_Opteron_G1.xml'/>
-       <include filename='x86_Opteron_G2.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 70c7d2091b..8d45feee00 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -24,6 +24,7 @@ cpumap_data = [
-   'ppc64_vendors.xml',
-   'x86_486-v1.xml',
-   'x86_486.xml',
-+  'x86_athlon-v1.xml',
-   'x86_athlon.xml',
-   'x86_Broadwell-IBRS.xml',
-   'x86_Broadwell-noTSX-IBRS.xml',
-diff --git a/src/cpu_map/x86_athlon-v1.xml b/src/cpu_map/x86_athlon-v1.xml
-new file mode 100644
-index 0000000000..cefe282c51
---- /dev/null
-+++ b/src/cpu_map/x86_athlon-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='athlon-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='athlon'/>
-+  </model>
-+</cpus>
-diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
-index 6a4196b735..b337947d3e 100644
---- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>athlon</model>
-+  <model>athlon-v1</model>
-   <vendor>AMD</vendor>
-   <signature family='16' model='4' stepping='2'/>
-   <feature name='pni'/>
-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 43e1ca8861..c71286deb2 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -788,11 +788,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 0718de04f7..26f3eed92b 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1431,7 +1431,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 6eb78e68f0..6e67479e25 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -787,11 +787,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 3b716faf00..d5b703e09a 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -810,11 +810,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 bd8c0a086c..5928a72da9 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1521,7 +1521,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index b6ec55cf0c..69c1eb816f 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -809,11 +809,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 e6615316f7..c65db67a41 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -911,11 +911,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 50d6395d7f..e85937b36d 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1718,7 +1718,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 974346f980..b1b76ad6fd 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -910,11 +910,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 812ebd5e0a..fa27ff520a 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -917,11 +917,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 24f22dd53f..33ff630126 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1733,7 +1733,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 9af219d59d..0cf8733f1e 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -916,11 +916,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 439f609233..ba3669f4b2 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -944,11 +944,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 53c114699c..43b6a68e24 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1757,7 +1757,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 6d91c4ac75..a7d454b330 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -943,11 +943,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 d61b339dd9..08c27dbab8 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -911,11 +911,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 a758fbabc5..8e974ebfde 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1705,7 +1705,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 48e8299c23..71cb90d172 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -910,11 +910,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 6a15994158..2d346b5a15 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -916,11 +916,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 4d0def8fc7..31a774af8a 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
-@@ -1414,7 +1414,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-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 4d0def8fc7..31a774af8a 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1414,7 +1414,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index ead8df9815..46b0e223c7 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -915,11 +915,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 1936c89c70..95d809d412 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -998,11 +998,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 d72b0c93d3..95c413a22f 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1509,7 +1509,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 4adb6402ae..4cd5d8e640 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -997,11 +997,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 c9f53064ff..94def05942 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1227,11 +1227,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-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 b2e2c3264b..958b250336 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1493,7 +1493,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index c630356571..4480ff39cd 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1226,11 +1226,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index 17f4f6c4f0..9f91f9ef93 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1228,11 +1228,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 3ea2911762..cf6ce11821 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1460,7 +1460,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 77286e9aef..07034ee9a7 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1227,11 +1227,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index d304fbd62b..020ad5bdba 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1228,11 +1228,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 3e6cc25529..b0a25f5ea6 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1389,7 +1389,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index a6fae9e3f1..f6e47f704a 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1227,11 +1227,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 060d96ab09..b501544f11 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1364,11 +1364,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 75f83cb376..1704b3b265 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1494,7 +1494,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 66dcb81fe6..3a1642af94 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1363,11 +1363,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 72df5e5e7d..91eab35039 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1364,11 +1364,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 6a756782cd..e807b965f6 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1494,7 +1494,8 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='yes' vendor='AMD'>athlon</model>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index ef7b2bb67b..a876e7b98f 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1363,11 +1363,16 @@
-       <blockers model='Westmere-v2'>
-         <feature name='spec-ctrl'/>
-       </blockers>
--      <model usable='no' vendor='AMD'>athlon</model>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-       <blockers model='athlon'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-avx10-CPU-features.patch b/SOURCES/libvirt-cpu_map-Add-avx10-CPU-features.patch
deleted file mode 100644
index 788f1e7..0000000
--- a/SOURCES/libvirt-cpu_map-Add-avx10-CPU-features.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 9a44ff8f39bc9873ea9efa42d5705dab5f43be2a Mon Sep 17 00:00:00 2001
-Message-ID: <9a44ff8f39bc9873ea9efa42d5705dab5f43be2a.1747908717.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 18 Dec 2024 13:30:16 +0100
-Subject: [PATCH] cpu_map: Add avx10* CPU features
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 30f05acf354437a776b528487bb70ddccf324cd2)
-
-https://issues.redhat.com/browse/RHEL-87796
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/x86_features.xml | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
-index 08bf014604..8be8fab42e 100644
---- a/src/cpu_map/x86_features.xml
-+++ b/src/cpu_map/x86_features.xml
-@@ -469,6 +469,9 @@
-   <feature name='prefetchiti'>
-     <cpuid eax_in='0x00000007' ecx_in='0x00000001' edx='0x00004000'/>
-   </feature>
-+  <feature name='avx10'>
-+    <cpuid eax_in='0x00000007' ecx_in='0x00000001' edx='0x00080000'/>
-+  </feature>
- 
-   <!-- cpuid level 0x00000007, 0x0002 (edx) -->
-   <feature name='mcdt-no'>
-@@ -541,6 +544,17 @@
-     <cpuid eax_in='0x00000014' ecx_in='0x00000000' ecx='0x80000000'/>
-   </feature>
- 
-+  <!-- cpuid level 0x00000024, 0x0000 (ebx) -->
-+  <feature name='avx10-128'>
-+    <cpuid eax_in='0x00000024' ecx_in='0x00000000' ebx='0x00010000'/>
-+  </feature>
-+  <feature name='avx10-256'>
-+    <cpuid eax_in='0x00000024' ecx_in='0x00000000' ebx='0x00020000'/>
-+  </feature>
-+  <feature name='avx10-512'>
-+    <cpuid eax_in='0x00000024' ecx_in='0x00000000' ebx='0x00040000'/>
-+  </feature>
-+
-   <!-- cpuid level 0x80000001 (ecx) -->
-   <feature name='lahf_lm'>
-     <alias name='lahf-lm' source='qemu'/>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch
deleted file mode 100644
index dfa2b4f..0000000
--- a/SOURCES/libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch
+++ /dev/null
@@ -1,827 +0,0 @@
-From 0d09852c46c6acfac300098f853f9f6f53ef0104 Mon Sep 17 00:00:00 2001
-Message-ID: <0d09852c46c6acfac300098f853f9f6f53ef0104.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:32:57 +0100
-Subject: [PATCH] cpu_map: Add core2duo-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit a3cab1ae67c4d0657a1ebfeaaa0e6d41d951d780)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                                 | 1 +
- src/cpu_map/meson.build                               | 1 +
- src/cpu_map/x86_core2duo-v1.xml                       | 6 ++++++
- tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml | 2 +-
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml    | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml            | 6 +++++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml        | 6 +++++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml        | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml            | 6 +++++-
- 44 files changed, 167 insertions(+), 41 deletions(-)
- create mode 100644 src/cpu_map/x86_core2duo-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 9534e5f308..eb847341da 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -21,6 +21,7 @@
-       <include filename='x86_n270.xml'/>
-       <include filename='x86_n270-v1.xml'/>
-       <include filename='x86_core2duo.xml'/>
-+      <include filename='x86_core2duo-v1.xml'/>
-     </group>
- 
-     <group name='Generic QEMU CPU models'>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 5e85e24eb9..b179fb442c 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -44,6 +44,7 @@ cpumap_data = [
-   'x86_Cooperlake-v1.xml',
-   'x86_Cooperlake-v2.xml',
-   'x86_Cooperlake.xml',
-+  'x86_core2duo-v1.xml',
-   'x86_core2duo.xml',
-   'x86_coreduo-v1.xml',
-   'x86_coreduo.xml',
-diff --git a/src/cpu_map/x86_core2duo-v1.xml b/src/cpu_map/x86_core2duo-v1.xml
-new file mode 100644
-index 0000000000..e23855ae75
---- /dev/null
-+++ b/src/cpu_map/x86_core2duo-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='core2duo-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='core2duo'/>
-+  </model>
-+</cpus>
-diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
-index a1a42d4b83..1bad0b11d3 100644
---- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>core2duo</model>
-+  <model>core2duo-v1</model>
-   <vendor>Intel</vendor>
-   <signature family='6' model='37' stepping='5'/>
-   <feature name='dtes64'/>
-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 1ba8a7eb11..d4853706b3 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -779,10 +779,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 1abbfcc4bb..03c88241c8 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1412,7 +1412,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 3040deeb50..75592e124e 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -778,10 +778,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 cb59946b78..de38e87010 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -801,10 +801,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 e6165eab77..29aa3f9adc 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1502,7 +1502,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 5aae9a3fca..6469251e47 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -800,10 +800,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 2898e56b41..3918fd5101 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -902,10 +902,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 2b5baf0a02..5d5b18cfdf 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1699,7 +1699,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 0fd3e38ee6..98bcfec2bb 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -901,10 +901,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 690959d35a..ed4a66a4ca 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -908,10 +908,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 6153d8a9ee..a748c623bc 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1714,7 +1714,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 15edc7e73d..f9a0221e7b 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -907,10 +907,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 a1f68beb2a..6b97ff8ba7 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -935,10 +935,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 9eda36d3c8..2e27e674f2 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1738,7 +1738,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 249baa1342..99d8cf9558 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -934,10 +934,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 b65196f979..e101305e83 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -902,10 +902,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 84df14bc63..24f90ed830 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1686,7 +1686,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 2e41f4a73a..0f993e3763 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -901,10 +901,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 ca8391756b..bfea565a00 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -907,10 +907,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 258212d852..91fc6133e4 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
-@@ -1399,7 +1399,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-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 258212d852..91fc6133e4 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1399,7 +1399,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 819010acff..1e8f10d17f 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -906,10 +906,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 68b1192153..8dfbc2b21a 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -989,10 +989,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 ea0bc81bea..6982dc8035 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1494,7 +1494,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index bddb1413a1..a739ec6b73 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -988,10 +988,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 7f1f4a2082..4d6e8c8a7f 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1218,10 +1218,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-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 e2fc678bb6..0009fb007d 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1480,7 +1480,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 4b0aed148d..74f9fe6dbe 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1217,10 +1217,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index ab371ea688..d4d7a9e079 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1219,10 +1219,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index a256fed6d7..b948f32538 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1447,7 +1447,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 3f952bb379..3e22f5e9b3 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1218,10 +1218,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 21358e340a..7a30c27b83 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1219,10 +1219,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index d34524193a..ee71c658cb 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1377,7 +1377,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 9bbb95c0cb..8509032a62 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1218,10 +1218,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index c5cbe2d855..b43b607c39 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1355,10 +1355,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 3ec8575cf4..b79140038c 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1482,7 +1482,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 513f4486cb..509b5a6c33 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1354,10 +1354,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 089ab497e0..9114ece766 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1355,10 +1355,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 64e893116a..e2e40d7ca2 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1482,7 +1482,8 @@
-         <feature name='spec-ctrl'/>
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
--      <model usable='yes' vendor='Intel'>core2duo</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 6e4f518b23..4a5a09c488 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1354,10 +1354,14 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>core2duo</model>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch
deleted file mode 100644
index 8d35604..0000000
--- a/SOURCES/libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch
+++ /dev/null
@@ -1,814 +0,0 @@
-From 679d1ce3b64151c9673a0287c5dada9f11b77cfc Mon Sep 17 00:00:00 2001
-Message-ID: <679d1ce3b64151c9673a0287c5dada9f11b77cfc.1734433245.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:30:57 +0100
-Subject: [PATCH] cpu_map: Add coreduo-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit ae14b20aaa11f506977b2e88b3c6050ad50ec33d)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_coreduo-v1.xml                     | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 6 +++++-
- 43 files changed, 166 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_coreduo-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 87cc4f61ed..d8df3b214d 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -17,6 +17,7 @@
-       <include filename='x86_pentium3-v1.xml'/>
-       <include filename='x86_pentiumpro.xml'/>
-       <include filename='x86_coreduo.xml'/>
-+      <include filename='x86_coreduo-v1.xml'/>
-       <include filename='x86_n270.xml'/>
-       <include filename='x86_core2duo.xml'/>
-     </group>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 6645786736..1213f6929c 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -45,6 +45,7 @@ cpumap_data = [
-   'x86_Cooperlake-v2.xml',
-   'x86_Cooperlake.xml',
-   'x86_core2duo.xml',
-+  'x86_coreduo-v1.xml',
-   'x86_coreduo.xml',
-   'x86_cpu64-rhel5.xml',
-   'x86_cpu64-rhel6.xml',
-diff --git a/src/cpu_map/x86_coreduo-v1.xml b/src/cpu_map/x86_coreduo-v1.xml
-new file mode 100644
-index 0000000000..c32be47485
---- /dev/null
-+++ b/src/cpu_map/x86_coreduo-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='coreduo-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='coreduo'/>
-+  </model>
-+</cpus>
-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 f887be4468..cb6db8f83c 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -783,10 +783,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 0c5a3a81f8..36625a07b3 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1413,7 +1413,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 7591b2efe9..fcd76f9bc8 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -782,10 +782,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 a7b325fd61..4b2d94b281 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -805,10 +805,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 63c1ff9b4a..b20dbe72c1 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1503,7 +1503,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 3d6ff5657e..ad3be21085 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -804,10 +804,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 e475c264ee..a76f03f910 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -906,10 +906,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 5deb101fe3..da44554a73 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1700,7 +1700,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index f4542588e8..4369595b2e 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -905,10 +905,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 c388b7919a..dc6dd2f743 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -912,10 +912,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 bae374c05b..d8bb03fbfd 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1715,7 +1715,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 43d1a8d3a2..69afbc55f0 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -911,10 +911,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 b882feace0..0798ee74de 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -939,10 +939,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 dcdad93bc4..07bbd505fa 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1739,7 +1739,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index f825365d4e..bf07fa3f51 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -938,10 +938,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 f8ac31d143..694561221f 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -906,10 +906,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 c4a159a3da..d98b895940 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1687,7 +1687,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 5efd8d499f..e02f39bdf5 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -905,10 +905,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 a0f10ca42d..faa838ee4b 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -911,10 +911,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 26e716e0e8..c65ffc40bb 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
-@@ -1400,7 +1400,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-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 26e716e0e8..c65ffc40bb 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1400,7 +1400,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 871949d74f..0a88511093 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -910,10 +910,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 9fb5e0a823..e931d7445d 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -993,10 +993,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 d7aeb43b83..c0cc453fd1 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1495,7 +1495,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 8e226ee237..59c36bfa49 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -992,10 +992,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 27fddae9f5..f822c040de 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1222,10 +1222,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-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 30169a55e4..7ea876c1fc 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1481,7 +1481,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index c91b05f312..56a57665f1 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1221,10 +1221,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index 76d9f80936..d2e14fcaab 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1223,10 +1223,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 7f08733452..25fe5a3f48 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1448,7 +1448,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 4bf5988cf3..dfcbcf2477 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1222,10 +1222,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 8e2d2a636e..7b20023b19 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1223,10 +1223,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 0b488faa07..ee58ddff1d 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1378,7 +1378,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 9b41cc5fcc..d2f19183f0 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1222,10 +1222,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 996a269525..3e3bd2b5e1 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1359,10 +1359,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 5d914aa62c..f4e8163256 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1483,7 +1483,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 094ec28df0..54d5323f71 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1358,10 +1358,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 0e9a63cf4e..b9697229d9 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1359,10 +1359,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 9fb8cb4e4a..cc672be9a1 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1483,7 +1483,8 @@
-       </blockers>
-       <model usable='yes' vendor='AMD'>athlon</model>
-       <model usable='yes' vendor='Intel'>core2duo</model>
--      <model usable='yes' vendor='Intel'>coreduo</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index d99a66ecfe..c29d1e99bc 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1358,10 +1358,14 @@
-       <blockers model='core2duo'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='no' vendor='Intel'>coreduo</model>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <blockers model='coreduo'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel'>n270</model>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch
deleted file mode 100644
index d55e392..0000000
--- a/SOURCES/libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-From e116e273f4d3a88c2997f1780b3a8d0633907fcf Mon Sep 17 00:00:00 2001
-Message-ID: <e116e273f4d3a88c2997f1780b3a8d0633907fcf.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:35:19 +0100
-Subject: [PATCH] cpu_map: Add kvm32-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 4a8259b5a3bfa224b431767e9091f54caefb25a2)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_kvm32-v1.xml                       | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
- 43 files changed, 88 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_kvm32-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 0fe2a513ca..81d77e4dba 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -28,6 +28,7 @@
-       <include filename='x86_qemu32.xml'/>
-       <include filename='x86_qemu32-v1.xml'/>
-       <include filename='x86_kvm32.xml'/>
-+      <include filename='x86_kvm32-v1.xml'/>
-       <include filename='x86_cpu64-rhel5.xml'/>
-       <include filename='x86_cpu64-rhel6.xml'/>
-       <include filename='x86_qemu64.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 61c5e403f9..d73a1b4feb 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -99,6 +99,7 @@ cpumap_data = [
-   'x86_IvyBridge-v2.xml',
-   'x86_IvyBridge.xml',
-   'x86_KnightsMill.xml',
-+  'x86_kvm32-v1.xml',
-   'x86_kvm32.xml',
-   'x86_kvm64.xml',
-   'x86_n270-v1.xml',
-diff --git a/src/cpu_map/x86_kvm32-v1.xml b/src/cpu_map/x86_kvm32-v1.xml
-new file mode 100644
-index 0000000000..cce4b1d7c5
---- /dev/null
-+++ b/src/cpu_map/x86_kvm32-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='kvm32-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='kvm32'/>
-+  </model>
-+</cpus>
-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 90a947b72a..da05a9358f 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -795,7 +795,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 a1d2982897..296f4bce12 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1416,7 +1416,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 1c6e65a408..dd5df8de0d 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -794,7 +794,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 bafaee4dc5..4330afb33a 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -817,7 +817,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 bac7c98eea..873d4b7b1f 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1506,7 +1506,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index fe78b42ab3..f1f8362f52 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -816,7 +816,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 c4e6cfeb84..7e0ed073a2 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -918,7 +918,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 3390d156e5..b93e3ca9ac 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1703,7 +1703,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 62d5a4bdad..8c538a6568 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -917,7 +917,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 77fa39cf13..dc8fd0539b 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -924,7 +924,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 ee36631717..e075cc7dca 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1718,7 +1718,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index fb66ff6032..d0955a30f2 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -923,7 +923,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 fbbe1f7ed4..4f2d2a272d 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -951,7 +951,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 f5a84c16f7..fcb175557c 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1742,7 +1742,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index d828319061..07fa015c26 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -950,7 +950,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 968be6fc31..7880718caf 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -918,7 +918,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 d0a03a641c..e34444f915 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1690,7 +1690,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index a0492d152e..dd045555db 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -917,7 +917,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 dfb06177ff..34527a0fc0 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -923,7 +923,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 90908a78e2..14f0bc7f87 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
-@@ -1403,7 +1403,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-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 90908a78e2..14f0bc7f87 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1403,7 +1403,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index f3c03fe68b..de7e039b84 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -922,7 +922,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 27e43a875e..eeee7b926c 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -1005,7 +1005,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 8fc17e9d8a..882ef3ed4d 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1498,7 +1498,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index ccaf3af991..dee27a40c4 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -1004,7 +1004,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 f77e36d1ea..14f9d0a3a5 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1234,7 +1234,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-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 5e5cf92e53..1347de2c5b 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1484,7 +1484,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 3b53baae7a..6855f75ba4 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1233,7 +1233,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index a4faf9112c..63bce83ba5 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1235,7 +1235,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 3e7ba22317..6b4db43077 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1451,7 +1451,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index a2fbea3b21..b9449120d3 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1234,7 +1234,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index b945327d7a..5b0f2f84be 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1235,7 +1235,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 1c00bbb899..04049d17af 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1381,7 +1381,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index c0d45ff56b..4ec2b2e96d 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1234,7 +1234,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 7d5c0b114d..9e152d5b55 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1371,7 +1371,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 915970f0ca..1c79f73ae2 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1486,7 +1486,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 3703b8b6f4..0af8a79cb4 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1370,7 +1370,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index c76d4d112f..4cb0a22a9b 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1371,7 +1371,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index cf9ef74abe..99858a0b91 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1486,7 +1486,8 @@
-       <model usable='yes' vendor='Intel'>core2duo-v1</model>
-       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index bb64a26754..cfedba3e8e 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1370,7 +1370,8 @@
-       <blockers model='coreduo-v1'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>kvm32</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch
deleted file mode 100644
index 6babb95..0000000
--- a/SOURCES/libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-From 7297a02322a0fcc19ab46d0a39f0adae25bbb1ed Mon Sep 17 00:00:00 2001
-Message-ID: <7297a02322a0fcc19ab46d0a39f0adae25bbb1ed.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:37:01 +0100
-Subject: [PATCH] cpu_map: Add kvm64-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 6d25eafaec0f138a57fbaa5c3e51952548ffae18)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_kvm64-v1.xml                       | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
- 43 files changed, 88 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_kvm64-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 8077da260d..a9a8d1b2c4 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -34,6 +34,7 @@
-       <include filename='x86_qemu64.xml'/>
-       <include filename='x86_qemu64-v1.xml'/>
-       <include filename='x86_kvm64.xml'/>
-+      <include filename='x86_kvm64-v1.xml'/>
-     </group>
- 
-     <group name='Intel CPU models'>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 799a72df47..7ea53373ae 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -101,6 +101,7 @@ cpumap_data = [
-   'x86_KnightsMill.xml',
-   'x86_kvm32-v1.xml',
-   'x86_kvm32.xml',
-+  'x86_kvm64-v1.xml',
-   'x86_kvm64.xml',
-   'x86_n270-v1.xml',
-   'x86_n270.xml',
-diff --git a/src/cpu_map/x86_kvm64-v1.xml b/src/cpu_map/x86_kvm64-v1.xml
-new file mode 100644
-index 0000000000..73d1e4f574
---- /dev/null
-+++ b/src/cpu_map/x86_kvm64-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='kvm64-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='kvm64'/>
-+  </model>
-+</cpus>
-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 e6c0863d54..985a00cf84 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -797,7 +797,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 7f68ca79c7..74aa563566 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1418,7 +1418,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 13aef737e2..4fdeaec417 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -796,7 +796,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 734d1f3bb2..284d70c7cc 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -819,7 +819,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 39f1aaf3f8..07097ce25b 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1508,7 +1508,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 3db605a87b..1aefe0ea08 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -818,7 +818,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 c77b05c257..2ffe8cb354 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -920,7 +920,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 67b5a9f3d8..2a084c64fe 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1705,7 +1705,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index daafd91079..bda2e0ef68 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -919,7 +919,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 6c15cae03d..d2fbcad98c 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -926,7 +926,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 2480513c4b..60093eda9a 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1720,7 +1720,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 914f011071..eafdc53ff6 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -925,7 +925,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 f368716de9..03896267d5 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -953,7 +953,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 c3dba8ccd7..52eb4b8215 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1744,7 +1744,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 4592e03dc4..f212097662 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -952,7 +952,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 39535a73ad..38b0f47092 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -920,7 +920,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 0694b5426e..43de9e5193 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1692,7 +1692,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index c36ebcf7fd..92514055c9 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -919,7 +919,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 3d15c7dca5..10017064b8 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -925,7 +925,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 bfb94bc389..95b582af9f 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
-@@ -1405,7 +1405,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-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 bfb94bc389..95b582af9f 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1405,7 +1405,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 2c3bca4a76..1e40bc5b23 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -924,7 +924,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 bf2c489691..392ec1e232 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -1007,7 +1007,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 345f8177f2..0893277250 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1500,7 +1500,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 758ce18d38..52ef9718d0 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -1006,7 +1006,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 4a478b678f..ef74bbd2fa 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1236,7 +1236,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-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 e3dda5ff74..404237ef67 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1486,7 +1486,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index aa94c97499..eafacf0b61 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1235,7 +1235,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index f3ad13ff40..c544eb02e3 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1237,7 +1237,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 4aa6ddca4f..b7b0ddd7c4 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1453,7 +1453,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 8ad3499c67..a4c86941c6 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1236,7 +1236,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index b3325f4e36..06341f125a 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1237,7 +1237,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 90a785ed55..e759a15ea7 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1383,7 +1383,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 9bac49c553..eb4822c667 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1236,7 +1236,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 986c3936c0..a6c7d8e74c 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1373,7 +1373,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 9f4d2d8af8..18070cd01a 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1488,7 +1488,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index e8b70c7e0f..e008a2f2e9 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1372,7 +1372,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 4ac90bad0d..ce19774d0d 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1373,7 +1373,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 94d866a5f0..217fbfe51c 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1488,7 +1488,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-       <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 84303bee0b..4f34340651 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1372,7 +1372,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm32-v1</model>
--      <model usable='yes' vendor='unknown'>kvm64</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-n270-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-n270-v1-CPU-model.patch
deleted file mode 100644
index db7a05e..0000000
--- a/SOURCES/libvirt-cpu_map-Add-n270-v1-CPU-model.patch
+++ /dev/null
@@ -1,840 +0,0 @@
-From 345fbc5a96c77d785879f1457dc83b5a9f6a5a30 Mon Sep 17 00:00:00 2001
-Message-ID: <345fbc5a96c77d785879f1457dc83b5a9f6a5a30.1734433245.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:32:08 +0100
-Subject: [PATCH] cpu_map: Add n270-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit c9fa77bfe84b8184254bb381d04f365391ab8a96)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_n270-v1.xml                        | 6 ++++++
- tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml  | 2 +-
- tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml  | 2 +-
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 6 +++++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 6 +++++-
- 45 files changed, 168 insertions(+), 42 deletions(-)
- create mode 100644 src/cpu_map/x86_n270-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index d8df3b214d..9534e5f308 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -19,6 +19,7 @@
-       <include filename='x86_coreduo.xml'/>
-       <include filename='x86_coreduo-v1.xml'/>
-       <include filename='x86_n270.xml'/>
-+      <include filename='x86_n270-v1.xml'/>
-       <include filename='x86_core2duo.xml'/>
-     </group>
- 
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 1213f6929c..5e85e24eb9 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -100,6 +100,7 @@ cpumap_data = [
-   'x86_KnightsMill.xml',
-   'x86_kvm32.xml',
-   'x86_kvm64.xml',
-+  'x86_n270-v1.xml',
-   'x86_n270.xml',
-   'x86_Nehalem-IBRS.xml',
-   'x86_Nehalem-v1.xml',
-diff --git a/src/cpu_map/x86_n270-v1.xml b/src/cpu_map/x86_n270-v1.xml
-new file mode 100644
-index 0000000000..f49b823953
---- /dev/null
-+++ b/src/cpu_map/x86_n270-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='n270-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='n270'/>
-+  </model>
-+</cpus>
-diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
-index 1e9c6782e9..10797e0633 100644
---- a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>n270</model>
-+  <model>n270-v1</model>
-   <vendor>Intel</vendor>
-   <signature family='6' model='28' stepping='10'/>
-   <feature name='dtes64'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
-index 4856cf53c4..498863b3ed 100644
---- a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>n270</model>
-+  <model>n270-v1</model>
-   <vendor>Intel</vendor>
-   <signature family='6' model='28' stepping='10'/>
-   <feature name='dtes64'/>
-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 cb6db8f83c..1ba8a7eb11 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -793,10 +793,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 36625a07b3..1abbfcc4bb 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1417,7 +1417,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index fcd76f9bc8..3040deeb50 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -792,10 +792,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 4b2d94b281..cb59946b78 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -815,10 +815,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 b20dbe72c1..e6165eab77 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1507,7 +1507,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index ad3be21085..5aae9a3fca 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -814,10 +814,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 a76f03f910..2898e56b41 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -916,10 +916,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 da44554a73..2b5baf0a02 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1704,7 +1704,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 4369595b2e..0fd3e38ee6 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -915,10 +915,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 dc6dd2f743..690959d35a 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -922,10 +922,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 d8bb03fbfd..6153d8a9ee 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1719,7 +1719,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 69afbc55f0..15edc7e73d 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -921,10 +921,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 0798ee74de..a1f68beb2a 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -949,10 +949,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 07bbd505fa..9eda36d3c8 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1743,7 +1743,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index bf07fa3f51..249baa1342 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -948,10 +948,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 694561221f..b65196f979 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -916,10 +916,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 d98b895940..84df14bc63 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1691,7 +1691,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index e02f39bdf5..2e41f4a73a 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -915,10 +915,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 faa838ee4b..ca8391756b 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -921,10 +921,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 c65ffc40bb..258212d852 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
-@@ -1404,7 +1404,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 c65ffc40bb..258212d852 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1404,7 +1404,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 0a88511093..819010acff 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -920,10 +920,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 e931d7445d..68b1192153 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -1003,10 +1003,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 c0cc453fd1..ea0bc81bea 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1499,7 +1499,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 59c36bfa49..bddb1413a1 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -1002,10 +1002,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 f822c040de..7f1f4a2082 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1232,10 +1232,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-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 7ea876c1fc..e2fc678bb6 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1485,7 +1485,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 56a57665f1..4b0aed148d 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1231,10 +1231,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index d2e14fcaab..ab371ea688 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1233,10 +1233,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 25fe5a3f48..a256fed6d7 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1452,7 +1452,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index dfcbcf2477..3f952bb379 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1232,10 +1232,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 7b20023b19..21358e340a 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1233,10 +1233,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index ee58ddff1d..d34524193a 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1382,7 +1382,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index d2f19183f0..9bbb95c0cb 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1232,10 +1232,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 3e3bd2b5e1..c5cbe2d855 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1369,10 +1369,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index f4e8163256..3ec8575cf4 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1487,7 +1487,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 54d5323f71..513f4486cb 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1368,10 +1368,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index b9697229d9..089ab497e0 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1369,10 +1369,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index cc672be9a1..64e893116a 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1487,7 +1487,8 @@
-       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='yes' vendor='Intel'>n270</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index c29d1e99bc..6e4f518b23 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1368,10 +1368,14 @@
-       </blockers>
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
--      <model usable='no' vendor='Intel'>n270</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-pentium-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-pentium-v1-CPU-model.patch
deleted file mode 100644
index e912aa2..0000000
--- a/SOURCES/libvirt-cpu_map-Add-pentium-v1-CPU-model.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-From f0ff972e084c4bc36624cfc965674a9d9ac91615 Mon Sep 17 00:00:00 2001
-Message-ID: <f0ff972e084c4bc36624cfc965674a9d9ac91615.1734433245.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:23:04 +0100
-Subject: [PATCH] cpu_map: Add pentium-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 70a4ec29a780d47b34ed0026f968cc4a66f3a2ee)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_pentium-v1.xml                     | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
- 43 files changed, 88 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_pentium-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index e9fb278fd3..a12c32eec6 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -10,6 +10,7 @@
- 
-     <group name='Intel-based QEMU generic CPU models'>
-       <include filename='x86_pentium.xml'/>
-+      <include filename='x86_pentium-v1.xml'/>
-       <include filename='x86_pentium2.xml'/>
-       <include filename='x86_pentium3.xml'/>
-       <include filename='x86_pentiumpro.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index b335278b08..2c76b32280 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -110,6 +110,7 @@ cpumap_data = [
-   'x86_Opteron_G4.xml',
-   'x86_Opteron_G5.xml',
-   'x86_Penryn.xml',
-+  'x86_pentium-v1.xml',
-   'x86_pentium.xml',
-   'x86_pentium2.xml',
-   'x86_pentium3.xml',
-diff --git a/src/cpu_map/x86_pentium-v1.xml b/src/cpu_map/x86_pentium-v1.xml
-new file mode 100644
-index 0000000000..2b690dab19
---- /dev/null
-+++ b/src/cpu_map/x86_pentium-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='pentium-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='pentium'/>
-+  </model>
-+</cpus>
-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 46f1bd7d4f..783df2e45f 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -793,7 +793,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 7153fe3925..b0c660dda2 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1417,7 +1417,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 93df9af8f6..d600d744f4 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -792,7 +792,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 25b16b34bb..5076c5f864 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -815,7 +815,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 c9a124cda2..d47632f95f 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1507,7 +1507,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index a99c89e98b..1a5ba3ed86 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -814,7 +814,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 c4f95a282b..6f444b15ec 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -916,7 +916,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 b6f01ffbce..d1a8a432d3 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1704,7 +1704,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 5d3c1ab1aa..9c83624e20 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -915,7 +915,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 c24b88f412..b696860c36 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -922,7 +922,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 eb8f5e3f22..686d89e864 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1719,7 +1719,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index b1f198d62b..c1ed9f13e9 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -921,7 +921,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 7a4830b126..1a0860f81a 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -949,7 +949,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 d624842aab..b8f950e7f3 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1743,7 +1743,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 43bcca9b52..9b7046a713 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -948,7 +948,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 275ce525fe..087c90344e 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -916,7 +916,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 6500ceac17..521eae41ce 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1691,7 +1691,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 1e54981f3c..5d6438d440 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -915,7 +915,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 5b1bb3ad55..b7175be7dc 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -921,7 +921,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 339c622684..08534be348 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
-@@ -1404,7 +1404,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 339c622684..08534be348 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1404,7 +1404,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index a016f77b09..f8b95431ac 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -920,7 +920,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 9a42375791..30cf441d89 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -1003,7 +1003,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 677ebbf2e6..940f1338e9 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1499,7 +1499,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 1eb4af3fdc..7ba288f0b2 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -1002,7 +1002,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 e2fa9da460..f5f6afb094 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1232,7 +1232,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-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 787fc9d870..3fabd84691 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1485,7 +1485,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 3fa195c6aa..b52d6d68d6 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1231,7 +1231,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index 5fe9ab775c..b67425cd20 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1233,7 +1233,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 5c9f1c92a5..69be0c7ffe 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1452,7 +1452,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 73f129706d..29e6285b17 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1232,7 +1232,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 2315bda338..c75666a7fd 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1233,7 +1233,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 90c9862321..de856ff33b 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1382,7 +1382,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 983597be92..b6d210838c 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1232,7 +1232,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 578dea23a5..054b233cfc 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1369,7 +1369,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 2009920390..d847b56680 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1487,7 +1487,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 505ea9978f..6a4918211c 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1368,7 +1368,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index e78f6a9dd3..fe8e7c6a8d 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1369,7 +1369,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index da9f2a1193..58ee6816e7 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1487,7 +1487,8 @@
-       <model usable='yes' vendor='unknown'>kvm32</model>
-       <model usable='yes' vendor='unknown'>kvm64</model>
-       <model usable='yes' vendor='Intel'>n270</model>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 74d1094511..7aae7a2904 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1368,7 +1368,8 @@
-       <blockers model='n270'>
-         <feature name='ss'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>pentium</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch
deleted file mode 100644
index a161cfa..0000000
--- a/SOURCES/libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-From 435f48536a5c989da9caf0dc0374e9c08f911a55 Mon Sep 17 00:00:00 2001
-Message-ID: <435f48536a5c989da9caf0dc0374e9c08f911a55.1734433245.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:25:30 +0100
-Subject: [PATCH] cpu_map: Add pentium2-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit df34ae48e9cb8fe0ed9b50900eab07cd6e87481c)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_pentium2-v1.xml                    | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
- 43 files changed, 88 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_pentium2-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index a12c32eec6..1f1536339c 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -12,6 +12,7 @@
-       <include filename='x86_pentium.xml'/>
-       <include filename='x86_pentium-v1.xml'/>
-       <include filename='x86_pentium2.xml'/>
-+      <include filename='x86_pentium2-v1.xml'/>
-       <include filename='x86_pentium3.xml'/>
-       <include filename='x86_pentiumpro.xml'/>
-       <include filename='x86_coreduo.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 2c76b32280..47c22db5b7 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -112,6 +112,7 @@ cpumap_data = [
-   'x86_Penryn.xml',
-   'x86_pentium-v1.xml',
-   'x86_pentium.xml',
-+  'x86_pentium2-v1.xml',
-   'x86_pentium2.xml',
-   'x86_pentium3.xml',
-   'x86_pentiumpro.xml',
-diff --git a/src/cpu_map/x86_pentium2-v1.xml b/src/cpu_map/x86_pentium2-v1.xml
-new file mode 100644
-index 0000000000..554aebce41
---- /dev/null
-+++ b/src/cpu_map/x86_pentium2-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='pentium2-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='pentium2'/>
-+  </model>
-+</cpus>
-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 783df2e45f..db91ece840 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -795,7 +795,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 b0c660dda2..17ad483a0c 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1419,7 +1419,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index d600d744f4..88b506eeac 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -794,7 +794,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 5076c5f864..ec626f9c82 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -817,7 +817,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 d47632f95f..1f9f215a63 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1509,7 +1509,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 1a5ba3ed86..3551b22832 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -816,7 +816,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 6f444b15ec..057b9a392a 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -918,7 +918,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 d1a8a432d3..e6a74efc27 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1706,7 +1706,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 9c83624e20..8583b09a19 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -917,7 +917,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 b696860c36..5662860ea4 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -924,7 +924,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 686d89e864..3ae800014b 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1721,7 +1721,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index c1ed9f13e9..ac04083e6d 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -923,7 +923,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 1a0860f81a..4c884f4385 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -951,7 +951,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 b8f950e7f3..6e308eb156 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1745,7 +1745,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 9b7046a713..347c13024b 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -950,7 +950,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 087c90344e..9d11b5f6c3 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -918,7 +918,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 521eae41ce..92d0d0d24f 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1693,7 +1693,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 5d6438d440..e3eb689de3 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -917,7 +917,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 b7175be7dc..d9aaf6bd10 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -923,7 +923,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 08534be348..1b4ee8ab7a 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
-@@ -1406,7 +1406,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 08534be348..1b4ee8ab7a 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1406,7 +1406,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index f8b95431ac..1bd4e45095 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -922,7 +922,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 30cf441d89..7b9d952866 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -1005,7 +1005,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 940f1338e9..dd96957e79 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1501,7 +1501,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 7ba288f0b2..876d2a37a8 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -1004,7 +1004,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 f5f6afb094..269c399d8c 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1234,7 +1234,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-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 3fabd84691..d0899b6beb 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1487,7 +1487,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index b52d6d68d6..647ba2ab7a 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1233,7 +1233,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index b67425cd20..a0b2a7c84b 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1235,7 +1235,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 69be0c7ffe..4b9cf3e152 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1454,7 +1454,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 29e6285b17..df21513db3 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1234,7 +1234,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index c75666a7fd..1c872e7f20 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1235,7 +1235,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index de856ff33b..439a82f4e2 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1384,7 +1384,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index b6d210838c..16764a7d67 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1234,7 +1234,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 054b233cfc..c45c2a88d5 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1371,7 +1371,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index d847b56680..2391821956 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1489,7 +1489,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 6a4918211c..1c23ac2b9d 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1370,7 +1370,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index fe8e7c6a8d..135546d930 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1371,7 +1371,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 58ee6816e7..2002feb338 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1489,7 +1489,8 @@
-       <model usable='yes' vendor='Intel'>n270</model>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 7aae7a2904..871af7f505 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1370,7 +1370,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
--      <model usable='yes' vendor='unknown'>pentium2</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown'>pentium3</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch
deleted file mode 100644
index 3040f31..0000000
--- a/SOURCES/libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-From cfb9b30ea4c8fc9304a2aa27946538e39fc7b7fd Mon Sep 17 00:00:00 2001
-Message-ID: <cfb9b30ea4c8fc9304a2aa27946538e39fc7b7fd.1734433245.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:28:21 +0100
-Subject: [PATCH] cpu_map: Add pentium3-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 886fd169c5e03ca9c065e69634ab3cd5656faf36)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_pentium3-v1.xml                    | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
- 43 files changed, 88 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_pentium3-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 1f1536339c..87cc4f61ed 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -14,6 +14,7 @@
-       <include filename='x86_pentium2.xml'/>
-       <include filename='x86_pentium2-v1.xml'/>
-       <include filename='x86_pentium3.xml'/>
-+      <include filename='x86_pentium3-v1.xml'/>
-       <include filename='x86_pentiumpro.xml'/>
-       <include filename='x86_coreduo.xml'/>
-       <include filename='x86_n270.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 47c22db5b7..6645786736 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -114,6 +114,7 @@ cpumap_data = [
-   'x86_pentium.xml',
-   'x86_pentium2-v1.xml',
-   'x86_pentium2.xml',
-+  'x86_pentium3-v1.xml',
-   'x86_pentium3.xml',
-   'x86_pentiumpro.xml',
-   'x86_phenom.xml',
-diff --git a/src/cpu_map/x86_pentium3-v1.xml b/src/cpu_map/x86_pentium3-v1.xml
-new file mode 100644
-index 0000000000..7547e0ef0c
---- /dev/null
-+++ b/src/cpu_map/x86_pentium3-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='pentium3-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='pentium3'/>
-+  </model>
-+</cpus>
-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 db91ece840..f887be4468 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -797,7 +797,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 17ad483a0c..0c5a3a81f8 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1421,7 +1421,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 88b506eeac..7591b2efe9 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -796,7 +796,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 ec626f9c82..a7b325fd61 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -819,7 +819,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 1f9f215a63..63c1ff9b4a 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1511,7 +1511,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 3551b22832..3d6ff5657e 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -818,7 +818,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 057b9a392a..e475c264ee 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -920,7 +920,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 e6a74efc27..5deb101fe3 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1708,7 +1708,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 8583b09a19..f4542588e8 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -919,7 +919,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 5662860ea4..c388b7919a 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -926,7 +926,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 3ae800014b..bae374c05b 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1723,7 +1723,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index ac04083e6d..43d1a8d3a2 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -925,7 +925,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 4c884f4385..b882feace0 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -953,7 +953,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 6e308eb156..dcdad93bc4 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1747,7 +1747,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 347c13024b..f825365d4e 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -952,7 +952,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 9d11b5f6c3..f8ac31d143 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -920,7 +920,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 92d0d0d24f..c4a159a3da 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1695,7 +1695,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index e3eb689de3..5efd8d499f 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -919,7 +919,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 d9aaf6bd10..a0f10ca42d 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -925,7 +925,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 1b4ee8ab7a..26e716e0e8 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
-@@ -1408,7 +1408,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-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 1b4ee8ab7a..26e716e0e8 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1408,7 +1408,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 1bd4e45095..871949d74f 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -924,7 +924,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 7b9d952866..9fb5e0a823 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -1007,7 +1007,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 dd96957e79..d7aeb43b83 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1503,7 +1503,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 876d2a37a8..8e226ee237 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -1006,7 +1006,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 269c399d8c..27fddae9f5 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1236,7 +1236,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-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 d0899b6beb..30169a55e4 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1489,7 +1489,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 647ba2ab7a..c91b05f312 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1235,7 +1235,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index a0b2a7c84b..76d9f80936 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1237,7 +1237,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 4b9cf3e152..7f08733452 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1456,7 +1456,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index df21513db3..4bf5988cf3 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1236,7 +1236,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 1c872e7f20..8e2d2a636e 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1237,7 +1237,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 439a82f4e2..0b488faa07 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1386,7 +1386,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 16764a7d67..9b41cc5fcc 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1236,7 +1236,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index c45c2a88d5..996a269525 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1373,7 +1373,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 2391821956..5d914aa62c 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1491,7 +1491,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 1c23ac2b9d..094ec28df0 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1372,7 +1372,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 135546d930..0e9a63cf4e 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1373,7 +1373,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 2002feb338..9fb8cb4e4a 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1491,7 +1491,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 871af7f505..d99a66ecfe 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1372,7 +1372,8 @@
-       <model usable='yes' vendor='unknown'>pentium-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
--      <model usable='yes' vendor='unknown'>pentium3</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-       <model usable='no' vendor='AMD'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-phenom-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-phenom-v1-CPU-model.patch
deleted file mode 100644
index 5a8d09b..0000000
--- a/SOURCES/libvirt-cpu_map-Add-phenom-v1-CPU-model.patch
+++ /dev/null
@@ -1,950 +0,0 @@
-From 83e6078e15989f132d4c949d23bd6042a20f507d Mon Sep 17 00:00:00 2001
-Message-ID: <83e6078e15989f132d4c949d23bd6042a20f507d.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:44:29 +0100
-Subject: [PATCH] cpu_map: Add phenom-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 332136e49ab4d122d053b11646c292a1a72e732a)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_phenom-v1.xml                      | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 6 +++++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 7 ++++++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 7 ++++++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 6 +++++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 7 ++++++-
- 43 files changed, 234 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_phenom-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 5f42fdc7fd..74b315c661 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -135,6 +135,7 @@
-       <include filename='x86_athlon.xml'/>
-       <include filename='x86_athlon-v1.xml'/>
-       <include filename='x86_phenom.xml'/>
-+      <include filename='x86_phenom-v1.xml'/>
-       <include filename='x86_Opteron_G1.xml'/>
-       <include filename='x86_Opteron_G2.xml'/>
-       <include filename='x86_Opteron_G3.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 8d45feee00..47c93deace 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -126,6 +126,7 @@ cpumap_data = [
-   'x86_pentium3-v1.xml',
-   'x86_pentium3.xml',
-   'x86_pentiumpro.xml',
-+  'x86_phenom-v1.xml',
-   'x86_phenom.xml',
-   'x86_qemu32-v1.xml',
-   'x86_qemu32.xml',
-diff --git a/src/cpu_map/x86_phenom-v1.xml b/src/cpu_map/x86_phenom-v1.xml
-new file mode 100644
-index 0000000000..f465c0e1d3
---- /dev/null
-+++ b/src/cpu_map/x86_phenom-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='phenom-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='phenom'/>
-+  </model>
-+</cpus>
-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 c71286deb2..27d36feccf 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -832,11 +832,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 26f3eed92b..b06febb821 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1449,10 +1449,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 6e67479e25..21b4ab8c5c 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -831,11 +831,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 d5b703e09a..83bb914c7d 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -854,11 +854,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 5928a72da9..47ab7240fb 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1539,10 +1539,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 69c1eb816f..cc212722f5 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -853,11 +853,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 c65db67a41..ec7abc3903 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -955,11 +955,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 e85937b36d..87fe22edd7 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1736,10 +1736,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index b1b76ad6fd..35bba84033 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -954,11 +954,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 fa27ff520a..b448d7bdb8 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -961,11 +961,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 33ff630126..a8a96f2bb4 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1751,10 +1751,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index 0cf8733f1e..303b714aa7 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -960,11 +960,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 ba3669f4b2..9da8e156e2 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -988,11 +988,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 43b6a68e24..a5b9edaeb6 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1775,10 +1775,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index a7d454b330..3029403bac 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -987,11 +987,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 08c27dbab8..259613d7fe 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -955,11 +955,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 8e974ebfde..d3ecad143c 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1723,10 +1723,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 71cb90d172..7f08dd995d 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -954,11 +954,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 2d346b5a15..1057fc58d3 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -960,11 +960,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 31a774af8a..fa4e9cfb8c 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
-@@ -1432,10 +1432,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 31a774af8a..fa4e9cfb8c 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1432,10 +1432,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 46b0e223c7..0c0f363d2b 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -959,11 +959,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 95d809d412..b1de96fadd 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -1042,11 +1042,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 95c413a22f..c83819435d 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1527,10 +1527,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index 4cd5d8e640..8f195f0e39 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -1041,11 +1041,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 94def05942..5495883fe9 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1271,11 +1271,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-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 958b250336..87fc57da66 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1511,10 +1511,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 4480ff39cd..43703fefab 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1270,11 +1270,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index 9f91f9ef93..2eab4e49b1 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1272,11 +1272,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index cf6ce11821..08b45ba90b 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1478,10 +1478,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 07034ee9a7..28b233d35d 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1271,11 +1271,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 020ad5bdba..16a3cdacb5 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1272,11 +1272,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index b0a25f5ea6..549e21c273 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1407,10 +1407,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index f6e47f704a..16e0d61c51 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1271,11 +1271,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index b501544f11..2b33304882 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1408,11 +1408,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 1704b3b265..f91fcdd4e5 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1512,10 +1512,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 3a1642af94..82fe2b3b1a 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1407,11 +1407,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 91eab35039..0c896766cb 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1408,11 +1408,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index e807b965f6..94c6914767 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1512,10 +1512,14 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index a876e7b98f..1f73e3903c 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1407,11 +1407,16 @@
-       <model usable='yes' vendor='unknown'>pentium2-v1</model>
-       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-       <model usable='yes' vendor='unknown'>pentium3-v1</model>
--      <model usable='no' vendor='AMD'>phenom</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-       <blockers model='phenom'>
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch
deleted file mode 100644
index 4805b7a..0000000
--- a/SOURCES/libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-From e901d5338199da24fa6a96410b1369df2ce13d5a Mon Sep 17 00:00:00 2001
-Message-ID: <e901d5338199da24fa6a96410b1369df2ce13d5a.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:34:21 +0100
-Subject: [PATCH] cpu_map: Add qemu32-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit d9b23d77c0165a3a1cbea6b6bf953ae49547b60d)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_qemu32-v1.xml                      | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
- 43 files changed, 88 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_qemu32-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index eb847341da..0fe2a513ca 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -26,6 +26,7 @@
- 
-     <group name='Generic QEMU CPU models'>
-       <include filename='x86_qemu32.xml'/>
-+      <include filename='x86_qemu32-v1.xml'/>
-       <include filename='x86_kvm32.xml'/>
-       <include filename='x86_cpu64-rhel5.xml'/>
-       <include filename='x86_cpu64-rhel6.xml'/>
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index b179fb442c..61c5e403f9 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -121,6 +121,7 @@ cpumap_data = [
-   'x86_pentium3.xml',
-   'x86_pentiumpro.xml',
-   'x86_phenom.xml',
-+  'x86_qemu32-v1.xml',
-   'x86_qemu32.xml',
-   'x86_qemu64.xml',
-   'x86_SandyBridge-IBRS.xml',
-diff --git a/src/cpu_map/x86_qemu32-v1.xml b/src/cpu_map/x86_qemu32-v1.xml
-new file mode 100644
-index 0000000000..904c3c6461
---- /dev/null
-+++ b/src/cpu_map/x86_qemu32-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='qemu32-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='qemu32'/>
-+  </model>
-+</cpus>
-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 d4853706b3..90a947b72a 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -816,7 +816,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 03c88241c8..a1d2982897 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1430,7 +1430,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index 75592e124e..1c6e65a408 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -815,7 +815,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 de38e87010..bafaee4dc5 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -838,7 +838,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 29aa3f9adc..bac7c98eea 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1520,7 +1520,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index 6469251e47..fe78b42ab3 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -837,7 +837,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 3918fd5101..c4e6cfeb84 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -939,7 +939,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 5d5b18cfdf..3390d156e5 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1717,7 +1717,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 98bcfec2bb..62d5a4bdad 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -938,7 +938,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 ed4a66a4ca..77fa39cf13 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -945,7 +945,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 a748c623bc..ee36631717 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1732,7 +1732,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index f9a0221e7b..fb66ff6032 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -944,7 +944,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 6b97ff8ba7..fbbe1f7ed4 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -972,7 +972,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 2e27e674f2..f5a84c16f7 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1756,7 +1756,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 99d8cf9558..d828319061 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -971,7 +971,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 e101305e83..968be6fc31 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -939,7 +939,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 24f90ed830..d0a03a641c 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1704,7 +1704,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index 0f993e3763..a0492d152e 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -938,7 +938,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 bfea565a00..dfb06177ff 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -944,7 +944,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 91fc6133e4..90908a78e2 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
-@@ -1417,7 +1417,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 91fc6133e4..90908a78e2 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1417,7 +1417,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index 1e8f10d17f..f3c03fe68b 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -943,7 +943,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 8dfbc2b21a..27e43a875e 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -1026,7 +1026,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 6982dc8035..8fc17e9d8a 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1512,7 +1512,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index a739ec6b73..ccaf3af991 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -1025,7 +1025,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 4d6e8c8a7f..f77e36d1ea 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1255,7 +1255,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-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 0009fb007d..5e5cf92e53 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1498,7 +1498,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 74f9fe6dbe..3b53baae7a 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1254,7 +1254,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index d4d7a9e079..a4faf9112c 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1256,7 +1256,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index b948f32538..3e7ba22317 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1465,7 +1465,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index 3e22f5e9b3..a2fbea3b21 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1255,7 +1255,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 7a30c27b83..b945327d7a 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1256,7 +1256,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index ee71c658cb..1c00bbb899 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1395,7 +1395,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 8509032a62..c0d45ff56b 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1255,7 +1255,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index b43b607c39..7d5c0b114d 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1392,7 +1392,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index b79140038c..915970f0ca 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1500,7 +1500,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 509b5a6c33..3703b8b6f4 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1391,7 +1391,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 9114ece766..c76d4d112f 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1392,7 +1392,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index e2e40d7ca2..cf9ef74abe 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1500,7 +1500,8 @@
-       <blockers model='phenom'>
-         <feature name='fxsr_opt'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index 4a5a09c488..bb64a26754 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1391,7 +1391,8 @@
-         <feature name='3dnow'/>
-         <feature name='3dnowext'/>
-       </blockers>
--      <model usable='yes' vendor='unknown'>qemu32</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-       <model usable='yes' vendor='unknown'>qemu64</model>
-     </mode>
-   </cpu>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch
deleted file mode 100644
index 5b2388c..0000000
--- a/SOURCES/libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-From 420c80f7e9d9d6eed500ad45c53a9bf49a00d07e Mon Sep 17 00:00:00 2001
-Message-ID: <420c80f7e9d9d6eed500ad45c53a9bf49a00d07e.1734433246.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 5 Dec 2024 15:36:14 +0100
-Subject: [PATCH] cpu_map: Add qemu64-v1 CPU model
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 2c6a015a7f7bdeffc38d5a16c91283c16325bef0)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/index.xml                              | 1 +
- src/cpu_map/meson.build                            | 1 +
- src/cpu_map/x86_qemu64-v1.xml                      | 6 ++++++
- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
- tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
- 43 files changed, 88 insertions(+), 40 deletions(-)
- create mode 100644 src/cpu_map/x86_qemu64-v1.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 81d77e4dba..8077da260d 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -32,6 +32,7 @@
-       <include filename='x86_cpu64-rhel5.xml'/>
-       <include filename='x86_cpu64-rhel6.xml'/>
-       <include filename='x86_qemu64.xml'/>
-+      <include filename='x86_qemu64-v1.xml'/>
-       <include filename='x86_kvm64.xml'/>
-     </group>
- 
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index d73a1b4feb..799a72df47 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -124,6 +124,7 @@ cpumap_data = [
-   'x86_phenom.xml',
-   'x86_qemu32-v1.xml',
-   'x86_qemu32.xml',
-+  'x86_qemu64-v1.xml',
-   'x86_qemu64.xml',
-   'x86_SandyBridge-IBRS.xml',
-   'x86_SandyBridge-v1.xml',
-diff --git a/src/cpu_map/x86_qemu64-v1.xml b/src/cpu_map/x86_qemu64-v1.xml
-new file mode 100644
-index 0000000000..1ed9da14a7
---- /dev/null
-+++ b/src/cpu_map/x86_qemu64-v1.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='qemu64-v1'>
-+    <decode host='on' guest='off'/>
-+    <model name='qemu64'/>
-+  </model>
-+</cpus>
-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 da05a9358f..e6c0863d54 100644
---- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
-@@ -819,7 +819,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 296f4bce12..7f68ca79c7 100644
---- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
-@@ -1433,7 +1433,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-index dd5df8de0d..13aef737e2 100644
---- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
-@@ -818,7 +818,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 4330afb33a..734d1f3bb2 100644
---- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
-@@ -841,7 +841,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 873d4b7b1f..39f1aaf3f8 100644
---- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
-@@ -1523,7 +1523,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-index f1f8362f52..3db605a87b 100644
---- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
-@@ -840,7 +840,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 7e0ed073a2..c77b05c257 100644
---- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
-@@ -942,7 +942,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 b93e3ca9ac..67b5a9f3d8 100644
---- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
-@@ -1720,7 +1720,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-index 8c538a6568..daafd91079 100644
---- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
-@@ -941,7 +941,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 dc8fd0539b..6c15cae03d 100644
---- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
-@@ -948,7 +948,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 e075cc7dca..2480513c4b 100644
---- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
-@@ -1735,7 +1735,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-index d0955a30f2..914f011071 100644
---- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
-@@ -947,7 +947,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 4f2d2a272d..f368716de9 100644
---- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
-@@ -975,7 +975,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 fcb175557c..c3dba8ccd7 100644
---- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
-@@ -1759,7 +1759,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-index 07fa015c26..4592e03dc4 100644
---- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
-@@ -974,7 +974,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 7880718caf..39535a73ad 100644
---- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
-@@ -942,7 +942,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 e34444f915..0694b5426e 100644
---- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
-@@ -1707,7 +1707,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-index dd045555db..c36ebcf7fd 100644
---- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
-@@ -941,7 +941,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 34527a0fc0..3d15c7dca5 100644
---- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
-@@ -947,7 +947,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 14f0bc7f87..bfb94bc389 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
-@@ -1420,7 +1420,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 14f0bc7f87..bfb94bc389 100644
---- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
-@@ -1420,7 +1420,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-index de7e039b84..2c3bca4a76 100644
---- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
-@@ -946,7 +946,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 eeee7b926c..bf2c489691 100644
---- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
-@@ -1029,7 +1029,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-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 882ef3ed4d..345f8177f2 100644
---- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
-@@ -1515,7 +1515,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-index dee27a40c4..758ce18d38 100644
---- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
-@@ -1028,7 +1028,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking 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 14f9d0a3a5..4a478b678f 100644
---- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
-@@ -1258,7 +1258,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking 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 1347de2c5b..e3dda5ff74 100644
---- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
-@@ -1501,7 +1501,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-index 6855f75ba4..aa94c97499 100644
---- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
-@@ -1257,7 +1257,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-index 63bce83ba5..f3ad13ff40 100644
---- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
-@@ -1259,7 +1259,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-index 6b4db43077..4aa6ddca4f 100644
---- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
-@@ -1468,7 +1468,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-index b9449120d3..8ad3499c67 100644
---- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
-@@ -1258,7 +1258,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-index 5b0f2f84be..b3325f4e36 100644
---- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
-@@ -1259,7 +1259,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-index 04049d17af..90a785ed55 100644
---- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
-@@ -1398,7 +1398,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-index 4ec2b2e96d..9bac49c553 100644
---- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
-@@ -1258,7 +1258,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-index 9e152d5b55..986c3936c0 100644
---- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
-@@ -1395,7 +1395,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-index 1c79f73ae2..9f4d2d8af8 100644
---- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
-@@ -1503,7 +1503,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-index 0af8a79cb4..e8b70c7e0f 100644
---- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
-@@ -1394,7 +1394,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-index 4cb0a22a9b..4ac90bad0d 100644
---- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
-@@ -1395,7 +1395,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-index 99858a0b91..94d866a5f0 100644
---- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
-@@ -1503,7 +1503,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
-diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-index cfedba3e8e..84303bee0b 100644
---- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
-@@ -1394,7 +1394,8 @@
-       </blockers>
-       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-       <model usable='yes' vendor='unknown'>qemu32-v1</model>
--      <model usable='yes' vendor='unknown'>qemu64</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-     </mode>
-   </cpu>
-   <memoryBacking supported='yes'>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-cpu_map-Add-sha512-sm3-and-sm4-CPU-features.patch b/SOURCES/libvirt-cpu_map-Add-sha512-sm3-and-sm4-CPU-features.patch
deleted file mode 100644
index 35a1057..0000000
--- a/SOURCES/libvirt-cpu_map-Add-sha512-sm3-and-sm4-CPU-features.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a28c3abf6f5c7c1d8d45b3fc681f6768e2a3d7a9 Mon Sep 17 00:00:00 2001
-Message-ID: <a28c3abf6f5c7c1d8d45b3fc681f6768e2a3d7a9.1747908718.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 18 Dec 2024 13:27:40 +0100
-Subject: [PATCH] cpu_map: Add sha512, sm3, and sm4 CPU features
-
-Introduced by Clearwater Forest platform.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 212b7d8e280cabddef1f0996bd9553c6a55babd8)
-
-https://issues.redhat.com/browse/RHEL-71898
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 153ee694e806ebf1ba684c1b7ddfa7a90c9d3adf)
-
-https://issues.redhat.com/browse/RHEL-87796
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/x86_features.xml | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
-index 8be8fab42e..0e1fee6e98 100644
---- a/src/cpu_map/x86_features.xml
-+++ b/src/cpu_map/x86_features.xml
-@@ -416,6 +416,15 @@
-   </feature>
- 
-   <!-- cpuid level 0x00000007, 0x0001 (eax) -->
-+  <feature name='sha512'>
-+    <cpuid eax_in='0x00000007' ecx_in='0x00000001' eax='0x00000001'/>
-+  </feature>
-+  <feature name='sm3'>
-+    <cpuid eax_in='0x00000007' ecx_in='0x00000001' eax='0x00000002'/>
-+  </feature>
-+  <feature name='sm4'>
-+    <cpuid eax_in='0x00000007' ecx_in='0x00000001' eax='0x00000004'/>
-+  </feature>
-   <feature name='avx-vnni'>
-     <cpuid eax_in='0x00000007' ecx_in='0x00000001' eax='0x00000010'/>
-   </feature>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-cpu_map-Sort-data-files-in-meson.build.patch b/SOURCES/libvirt-cpu_map-Sort-data-files-in-meson.build.patch
deleted file mode 100644
index 8fe058a..0000000
--- a/SOURCES/libvirt-cpu_map-Sort-data-files-in-meson.build.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 9c52c91dd1d901dc23105c475ea01631315b827e Mon Sep 17 00:00:00 2001
-Message-ID: <9c52c91dd1d901dc23105c475ea01631315b827e.1734433245.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 28 Nov 2024 13:24:49 +0100
-Subject: [PATCH] cpu_map: Sort data files in meson.build
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 50c6d727b6f0cc00333a1bc26925ab5f26f8f781)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/meson.build | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 88d67f4cce..f659ef230e 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -4,8 +4,8 @@ cpumap_data = [
-   'arm_cortex-a57.xml',
-   'arm_cortex-a72.xml',
-   'arm_Falkor.xml',
--  'arm_FT-2000plus.xml',
-   'arm_features.xml',
-+  'arm_FT-2000plus.xml',
-   'arm_Kunpeng-920.xml',
-   'arm_Neoverse-N1.xml',
-   'arm_Neoverse-N2.xml',
-@@ -14,11 +14,11 @@ cpumap_data = [
-   'arm_ThunderX299xx.xml',
-   'arm_vendors.xml',
-   'index.xml',
-+  'ppc64_POWER10.xml',
-   'ppc64_POWER6.xml',
-   'ppc64_POWER7.xml',
-   'ppc64_POWER8.xml',
-   'ppc64_POWER9.xml',
--  'ppc64_POWER10.xml',
-   'ppc64_POWERPC_e5500.xml',
-   'ppc64_POWERPC_e6500.xml',
-   'ppc64_vendors.xml',
-@@ -54,13 +54,8 @@ cpumap_data = [
-   'x86_Dhyana-v1.xml',
-   'x86_Dhyana-v2.xml',
-   'x86_Dhyana.xml',
--  'x86_EPYC-IBPB.xml',
--  'x86_EPYC-v1.xml',
--  'x86_EPYC-v2.xml',
--  'x86_EPYC-v3.xml',
--  'x86_EPYC-v4.xml',
--  'x86_EPYC.xml',
-   'x86_EPYC-Genoa.xml',
-+  'x86_EPYC-IBPB.xml',
-   'x86_EPYC-Milan-v1.xml',
-   'x86_EPYC-Milan-v2.xml',
-   'x86_EPYC-Milan.xml',
-@@ -69,6 +64,11 @@ cpumap_data = [
-   'x86_EPYC-Rome-v3.xml',
-   'x86_EPYC-Rome-v4.xml',
-   'x86_EPYC-Rome.xml',
-+  'x86_EPYC-v1.xml',
-+  'x86_EPYC-v2.xml',
-+  'x86_EPYC-v3.xml',
-+  'x86_EPYC-v4.xml',
-+  'x86_EPYC.xml',
-   'x86_features.xml',
-   'x86_GraniteRapids-v1.xml',
-   'x86_GraniteRapids.xml',
--- 
-2.47.1
diff --git a/SOURCES/libvirt-docs-document-using-passt-backend-with-interface-type-vhostuser.patch b/SOURCES/libvirt-docs-document-using-passt-backend-with-interface-type-vhostuser.patch
deleted file mode 100644
index 34d885f..0000000
--- a/SOURCES/libvirt-docs-document-using-passt-backend-with-interface-type-vhostuser.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 3bcec68251696b1255be7dc2504378b927ef5123 Mon Sep 17 00:00:00 2001
-Message-ID: <3bcec68251696b1255be7dc2504378b927ef5123.1739824250.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 14 Feb 2025 23:35:56 -0500
-Subject: [PATCH] docs: document using passt backend with <interface
- type='vhostuser'>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Almost everything is already there (in the section for using passt
-with type='user'), so we just need to point to that from the
-type='vhostuser' section (and vice versa), and add a bit of glue.
-
-Also updated a few related details that have changed (e.g. default
-model type for vhostuser is now 'virtio', and source type/mode are now
-optional), and changed "vhost-user interface" to "vhost-user
-connection" because the interface is a virtio interface, and
-vhost-user is being used to connect that interface to the outside.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 96fd17a99b514e585a94d43d40ab9a74907c7a5b)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- docs/formatdomain.rst | 73 ++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 62 insertions(+), 11 deletions(-)
-
-diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index 577366b934..c077c09a39 100644
---- a/docs/formatdomain.rst
-+++ b/docs/formatdomain.rst
-@@ -5131,6 +5131,15 @@ destined for the host toward the guest instead), and a socket between
- passt and QEMU forwards that traffic on to the guest (and back out,
- of course).
- 
-+*(:since:`Since 11.1.0 (QEMU and KVM only)` you may prefer to use the
-+passt backend with the more efficient and performant type='vhostuser'
-+rather than type='user'. All the options related to passt in the
-+paragraphs below here also apply when using the passt backend with
-+type='vhostuser'; any other details specific to vhostuser are
-+described* `here
-+<formatdomain.html#vhost-user-connection-with-passt-backend>`__.)
-+
-+
- Similar to SLIRP, passt has an internal DHCP server that provides a
- requesting guest with one ipv4 and one ipv6 address. There are default
- values for both of these, or you can use the ``<ip>`` element
-@@ -5823,7 +5832,7 @@ following attributes are available for the ``virtio`` NIC driver:
-    The optional ``queues`` attribute controls the number of queues to be used
-    for either `Multiqueue
-    virtio-net <https://www.linux-kvm.org/page/Multiqueue>`__ or vhost-user (See
--   `vhost-user interface`_) network interfaces. Use of multiple packet
-+   `vhost-user connection`_) network interfaces. Use of multiple packet
-    processing queues requires the interface having the
-    ``<model type='virtio'/>`` element. Each queue will potentially be handled by
-    a different processor, resulting in much higher throughput.
-@@ -6267,8 +6276,8 @@ similarly named elements used to configure the guest side of the interface
- (described above).
- 
- 
--vhost-user interface
--^^^^^^^^^^^^^^^^^^^^
-+vhost-user connection
-+^^^^^^^^^^^^^^^^^^^^^
- 
- :since:`Since 1.2.7` the vhost-user enables the communication between a QEMU
- virtual machine and other userspace process using the Virtio transport protocol.
-@@ -6295,16 +6304,58 @@ plane is based on shared memory.
-    </devices>
-    ...
- 
--The ``<source>`` element has to be specified along with the type of char device.
--Currently, only type='unix' is supported, where the path (the directory path of
--the socket) and mode attributes are required. Both ``mode='server'`` and
--``mode='client'`` are supported. vhost-user requires the virtio model type, thus
--the ``<model>`` element is mandatory. :since:`Since 4.1.0` the element has an
--optional child element ``reconnect`` which configures reconnect timeout if the
--connection is lost. It has two attributes ``enabled`` (which accepts ``yes`` and
--``no``) and ``timeout`` which specifies the amount of seconds after which
-+The ``<source>`` element has to be specified along with the type of
-+char device.  Currently, only type='unix' is supported, where the path
-+(the directory path of the socket) and mode attributes are
-+required. Both ``mode='server'`` and ``mode='client'`` are
-+supported. (:since:`Since 11.1.0` the default source type for
-+vhostuser interfaces is 'unix' and default mode is 'client', so those
-+two attributes are now optional).
-+
-+The vhost-user protocol only works with the virtio guest driver, so
-+the ``<model>`` element ``type`` attribute is mandatory (:since:`Since
-+11.1.0` the default model type for vhostuser interfaces is now
-+'virtio' so ``<model>`` is no longer mandatory). :since:`Since 4.1.0`
-+the ``<source>`` element has an optional child element ``reconnect``
-+which configures reconnect timeout if the connection is lost. It has
-+two attributes ``enabled`` (which accepts ``yes`` and ``no``) and
-+``timeout`` which specifies the amount of seconds after which
- hypervisor tries to reconnect.
- 
-+
-+vhost-user connection with passt backend
-+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+
-+:since:`Since 11.1.0 (QEMU and KVM only)` passt can be used as the
-+other end of the vhost-user connection. This is a compelling
-+alternative, because passt provides all of its network connectivity
-+without requiring any elevated privileges or capabilities, and
-+vhost-user uses shared memory to make this unprivileged connection
-+very high performance as well. You can set a type='vhostuser'
-+interface to use passt as the backend by adding ``<backend
-+type='passt'/>``. When passt is the backend, only a single driver
-+queue is supported, and the ``<source>`` path/type/mode are all
-+implied to be "matching the passt process" so **must not** be
-+specified. All of the passt options `described here
-+<formatdomain.html#userspace-connection-using-passt>`__, are also
-+supported for ``type='vhostuser'`` with the passt backend, e.g.
-+setting guest-side IP addresses with ``<ip>`` and port forwarding with
-+``<portForward``.
-+
-+::
-+
-+   ...
-+   <devices>
-+     <interface type='vhostuser'>
-+       <backend type='passt'/>
-+       <mac address='52:54:00:3b:83:1a'/>
-+       <source dev='enp1s0'/>
-+       <ip address='10.30.0.5 prefix='24'/>
-+     </interface>
-+   </devices>
-+   ...
-+
-+
- Traffic filtering with NWFilter
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 
--- 
-2.48.1
diff --git a/SOURCES/libvirt-docs-formatdomain-Fix-indentation-of-docs-for-disk-driver-statistics-element.patch b/SOURCES/libvirt-docs-formatdomain-Fix-indentation-of-docs-for-disk-driver-statistics-element.patch
new file mode 100644
index 0000000..1c4301d
--- /dev/null
+++ b/SOURCES/libvirt-docs-formatdomain-Fix-indentation-of-docs-for-disk-driver-statistics-element.patch
@@ -0,0 +1,62 @@
+From b2fc2869c2b5fa6b2c05b3d05b63d1b4761788e4 Mon Sep 17 00:00:00 2001
+Message-ID: <b2fc2869c2b5fa6b2c05b3d05b63d1b4761788e4.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 30 Jan 2026 17:47:46 +0100
+Subject: [PATCH] docs: formatdomain: Fix indentation of docs for
+ <disk><driver><statistics> element
+
+All other paragraphs in this section use 2 spaces after hyphen, fix the
+recently added section.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 7da1a83914ca10cc811583d7310bf60e04b70488)
+
+https://issues.redhat.com/browse/RHEL-147866 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-131335 [rhel-10.2]
+---
+ docs/formatdomain.rst | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
+index 9836837441..45f262113b 100644
+--- a/docs/formatdomain.rst
++++ b/docs/formatdomain.rst
+@@ -3605,22 +3605,22 @@ paravirtualized driver is specified via the ``disk`` element.
+           </iothreads>
+         </driver>
+ 
+-   - The optional ``statistics`` sub-element allows configuring statistics
+-     collection in configurable intervals for the given disk. Intervals are
+-     configured by ``<statistic>`` sub-elements with ``interval`` attribute
+-     configuring the collection window duration in seconds. The statistics
+-     are available via the bulk statistics API.
++   -  The optional ``statistics`` sub-element allows configuring statistics
++      collection in configurable intervals for the given disk. Intervals are
++      configured by ``<statistic>`` sub-elements with ``interval`` attribute
++      configuring the collection window duration in seconds. The statistics
++      are available via the bulk statistics API.
+ 
+-     Example::
++      Example::
+ 
+-       <driver name='qemu'>
+-         <statistics>
+-           <statistic interval='1'/>
+-           <statistic interval='10'/>
+-         </statistics>
+-       </driver>
++        <driver name='qemu'>
++          <statistics>
++            <statistic interval='1'/>
++            <statistic interval='10'/>
++          </statistics>
++        </driver>
+ 
+-    :since:`Since 11.9.0 (QEMU 10.2, virtio, ide, scsi disks only)`.
++      :since:`Since 11.9.0 (QEMU 10.2, virtio, ide, scsi disks only)`.
+ 
+    -  The optional ``queues`` attribute specifies the number of virt queues for
+       virtio-blk ( :since:`Since 3.9.0` ) or vhost-user-blk
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-docs-formatdomain-Reword-section-about-the-statistics-element-under-disk-driver.patch b/SOURCES/libvirt-docs-formatdomain-Reword-section-about-the-statistics-element-under-disk-driver.patch
new file mode 100644
index 0000000..e2ba6a4
--- /dev/null
+++ b/SOURCES/libvirt-docs-formatdomain-Reword-section-about-the-statistics-element-under-disk-driver.patch
@@ -0,0 +1,51 @@
+From b87a18dada6e991dc2389c822cde38d4abc267fa Mon Sep 17 00:00:00 2001
+Message-ID: <b87a18dada6e991dc2389c822cde38d4abc267fa.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 30 Jan 2026 17:37:48 +0100
+Subject: [PATCH] docs: formatdomain: Reword section about the '<statistics>'
+ element under disk driver
+
+Separate the timed statistics group and link to the fields which are
+returned by it.
+
+Prepare the wording for more statistics configs in the future.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit ad65b00c1393f7f13e15744e2e1be4fb531e2a17)
+
+https://issues.redhat.com/browse/RHEL-147866 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-131335 [rhel-10.2]
+---
+ docs/formatdomain.rst | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
+index 45f262113b..70882c6820 100644
+--- a/docs/formatdomain.rst
++++ b/docs/formatdomain.rst
+@@ -3605,11 +3605,17 @@ paravirtualized driver is specified via the ``disk`` element.
+           </iothreads>
+         </driver>
+ 
+-   -  The optional ``statistics`` sub-element allows configuring statistics
+-      collection in configurable intervals for the given disk. Intervals are
+-      configured by ``<statistic>`` sub-elements with ``interval`` attribute
+-      configuring the collection window duration in seconds. The statistics
+-      are available via the bulk statistics API.
++   -  The optional ``statistics`` sub-element allows configuring various optional
++      statistics collection.
++
++      Statistic values returned under
++      `VIR_DOMAIN_STATS_BLOCK_SUFFIX_TIMED_GROUP_PREFIX <html/libvirt-libvirt-domain.html#VIR_DOMAIN_STATS_BLOCK_SUFFIX_TIMED_GROUP_PREFIX>`__
++      typed parameter prefix returned by the
++      `virConnectGetAllDomainStats <html/libvirt-libvirt-domain.html#virConnectGetAllDomainStats>`__
++      API are collected based on one or more configurable intervals. An interval
++      of collection is configured by ``<statistic>`` sub-elements with
++      ``interval`` attribute configuring the collection window duration in
++      seconds.
+ 
+       Example::
+ 
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-docs-formatdomain-document-intel-only-IOMMU-attributes.patch b/SOURCES/libvirt-docs-formatdomain-document-intel-only-IOMMU-attributes.patch
deleted file mode 100644
index e0038cf..0000000
--- a/SOURCES/libvirt-docs-formatdomain-document-intel-only-IOMMU-attributes.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 229d362a429fdcf64f91cf2422ab6a402d0af3fa Mon Sep 17 00:00:00 2001
-Message-ID: <229d362a429fdcf64f91cf2422ab6a402d0af3fa.1752749355.git.jdenemar@redhat.com>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Wed, 19 Mar 2025 01:55:02 +0100
-Subject: [PATCH] docs: formatdomain: document intel-only IOMMU attributes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 6291b0af3dd6a34b5a0f5f56dafa881d9c262f57)
-
-https://issues.redhat.com/browse/RHEL-50560
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
----
- docs/formatdomain.rst | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index 961d20a41d..a950ee1cb4 100644
---- a/docs/formatdomain.rst
-+++ b/docs/formatdomain.rst
-@@ -8857,14 +8857,15 @@ Example:
-    ``caching_mode``
-       The ``caching_mode`` attribute with possible values ``on`` and ``off`` can
-       be used to turn on the VT-d caching mode (useful for assigned devices).
--      :since:`Since 3.4.0` (QEMU/KVM only)
-+      :since:`Since 3.4.0` (QEMU/KVM and ``intel`` model only)
- 
-    ``eim``
-       The ``eim`` attribute (with possible values ``on`` and ``off``) can be
-       used to configure Extended Interrupt Mode. A q35 domain with split I/O
-       APIC (as described in `Hypervisor features`_), and
-       both interrupt remapping and EIM turned on for the IOMMU, will be able to
--      use more than 255 vCPUs. :since:`Since 3.4.0` (QEMU/KVM only)
-+      use more than 255 vCPUs. :since:`Since 3.4.0` (QEMU/KVM and ``intel`` model
-+      only)
- 
-    ``iotlb``
-       The ``iotlb`` attribute with possible values ``on`` and ``off`` can be
-@@ -8874,14 +8875,14 @@ Example:
-    ``aw_bits``
-       The ``aw_bits`` attribute can be used to set the address width to allow
-       mapping larger iova addresses in the guest. :since:`Since 6.5.0` (QEMU/KVM
--      only)
-+      and ``intel`` model only)
- 
-    ``dma_translation``
-       The ``dma_translation`` attribute with possible values ``on`` and ``off`` can
-       be used to turn off the dma translation for IOMMU. It is useful when only
-       interrupt remapping is required but dma translation overhead is unwanted, for
-       example to efficiently enable more than 255 vCPUs.
--      :since:`Since 10.7.0` (QEMU/KVM only)
-+      :since:`Since 10.7.0` (QEMU/KVM and ``intel`` model only)
- 
- The ``virtio`` IOMMU devices can further have ``address`` element as described
- in `Device addresses`_ (address has to by type of ``pci``).
--- 
-2.50.1
diff --git a/SOURCES/libvirt-docs-improve-type-user-docs-to-higlight-differences-between-SLIRP-and-passt.patch b/SOURCES/libvirt-docs-improve-type-user-docs-to-higlight-differences-between-SLIRP-and-passt.patch
deleted file mode 100644
index e027b71..0000000
--- a/SOURCES/libvirt-docs-improve-type-user-docs-to-higlight-differences-between-SLIRP-and-passt.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 42b16d6b87ad5449f93cda5f31cde92d0cca074f Mon Sep 17 00:00:00 2001
-Message-ID: <42b16d6b87ad5449f93cda5f31cde92d0cca074f.1739824249.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 14 Feb 2025 22:43:03 -0500
-Subject: [PATCH] docs: improve type='user' docs to higlight differences
- between SLIRP and passt
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reorganizes the section about <interface type='user'> and
-describes the differences in behavior between SLIRP and passt.
-
-Resolves: https://issues.redhat.com/browse/RHEL-46601
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit a47a89a9d335c111a9c2fbb3f4e1c3a13001e74b)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- docs/formatdomain.rst | 116 ++++++++++++++++++++++++++++--------------
- 1 file changed, 78 insertions(+), 38 deletions(-)
-
-diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index 8d787ef59a..577366b934 100644
---- a/docs/formatdomain.rst
-+++ b/docs/formatdomain.rst
-@@ -5072,25 +5072,34 @@ to the interface.
-    </devices>
-    ...
- 
--Userspace (SLIRP or passt) connection
--^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+Userspace connection using SLIRP
-+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 
--The ``user`` type connects the guest interface to the outside via a
-+The ``user`` interface type connects the guest interface to the outside via a
- transparent userspace proxy that doesn't require any special system
- privileges, making it usable in cases when libvirt itself is running
- with no privileges (e.g. libvirt's "session mode" daemon, or when
- libvirt is run inside an unprivileged container).
- 
--By default, this user proxy is done with QEMU's internal SLIRP driver
--which has DHCP & DNS services that give the guest IP addresses
--starting from ``10.0.2.15``, a default route of ``10.0.2.2`` and DNS
--server of ``10.0.2.3``. :since:`Since 3.8.0` it is possible to override
--the default network address by including an ``ip`` element specifying
--an IPv4 address in its one mandatory attribute,
--``address``. Optionally, a second ``ip`` element with a ``family``
--attribute set to "ipv6" can be specified to add an IPv6 address to the
--interface. ``address``. Optionally, address ``prefix`` can be
--specified.
-+By default, this user proxy is done with QEMU's SLIRP driver, a
-+userspace proxy built into QEMU that has DHCP & DNS services that give
-+the guest an IP address of ``10.0.2.15``, a default route of
-+``10.0.2.2`` and DNS server at ``10.0.2.3``.
-+
-+:since:`Since 3.8.0` it is possible to override the guest's default
-+network address by including an ``ip`` element specifying an IPv4
-+address in its one mandatory attribute, ``address``. Optionally, a
-+second ``ip`` element with a ``family`` attribute set to "ipv6" can be
-+specified to add an IPv6 address to the interface. ``address``.
-+Optionally, an address ``prefix`` can be specified. These settings are
-+surprisingly **not** used by SLIRP to set the exact IP address;
-+instead they are used to determine what network/subnet the guest's IP
-+address should be on, and the guest will be given an address in that
-+subnet, but the host portion of the address will still be "2.15". In
-+the example below, for example, the guest will be given the IP address
-+172.17.2.15 (**note that the '1.1' in the host portion of the address
-+has been ignored**), default route of 172.17.2.2, and DNS server
-+172.17.2.3.
- 
- ::
- 
-@@ -5100,34 +5109,65 @@ specified.
-      ...
-      <interface type='user'>
-        <mac address="00:11:22:33:44:55"/>
--       <ip family='ipv4' address='172.17.2.0' prefix='24'/>
--       <ip family='ipv6' address='2001:db8:ac10:fd01::' prefix='64'/>
-+       <ip family='ipv4' address='172.17.1.1' prefix='16'/>
-+       <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
-      </interface>
-    </devices>
-    ...
- 
--:since:`Since 9.0.0` an alternate backend implementation of the
--``user`` interface type can be selected by setting the interface's
--``<backend>`` subelement ``type`` attribute to ``passt``. In this
--case, the passt transport (https://passt.top) is used. Similar to
--SLIRP, passt has an internal DHCP server that provides a requesting
--guest with one ipv4 and one ipv6 address; it then uses userspace
--proxies and a separate network namespace to provide outgoing
--UDP/TCP/ICMP sessions, and optionally redirect incoming traffic
--destined for the host toward the guest instead.
--
--When the passt backend is used, the ``<backend>`` attribute
--``logFile`` can be used to tell the passt process for this interface
--where to write its message log, and the ``<source>`` attribute ``dev``
--can tell it to use a particular host interface to derive the routes
--given to the guest for forwarding traffic upstream.  Due to the design
--decisions of passt, if using SELinux, the log file is recommended to
--reside in the runtime directory of a user under which the passt
--process will run, most probably ``/run/user/$UID`` where ``$UID`` is
--the UID of the user, e.g. ``qemu``.  Beware that libvirt does not
--create this directory if it does not already exist to avoid possible,
--however unlikely, issues, especially since this logfile attribute is
--meant mostly for debugging.
-+Userspace connection using passt
-+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+
-+:since:`Since 9.0.0 (QEMU and KVM only)` an alternate backend
-+implementation of the ``user`` interface type can be selected by
-+setting the interface's ``<backend>`` subelement ``type`` attribute to
-+``passt``. In this case, the passt transport `(details here)
-+<https://passt.top>`__ is used. passt is run as a separate process
-+from QEMU - the passt process handles the details of forwarding
-+network traffic back and forth to the physical network (using
-+userspace proxies and a separate network namespace to provide outgoing
-+UDP/TCP/ICMP sessions, and optionally redirecting incoming traffic
-+destined for the host toward the guest instead), and a socket between
-+passt and QEMU forwards that traffic on to the guest (and back out,
-+of course).
-+
-+Similar to SLIRP, passt has an internal DHCP server that provides a
-+requesting guest with one ipv4 and one ipv6 address. There are default
-+values for both of these, or you can use the ``<ip>`` element
-+(described above, with behavioral differences as outlined below) to
-+configure one IPv4 and one IPv6 address that passt's DHCP server can
-+provide to the guest.
-+
-+Unlike SLIRP, when no `<ip>`` address is specified, passt will by
-+default provide the guest with an IP address, DNS server, etc. that
-+are identical to those settings on the host itself (through the magic
-+of the proxies and a separate network namespace, this doesn't create
-+any conflict).
-+
-+Also different from SLIRP's behavior: if you do specify IP
-+address(es), the exact address and netmask/prefix you specify will be
-+provided to the guest (i.e. passt doesn't interpret the <ip> settings
-+as a network address like SLIRP does, but as a host address). In
-+example given above, the guest IP would be set to exactly 172.17.1.1.
-+
-+Just as with SLIRP, though, once traffic from the guest leaves the
-+host towards the rest of the network, it will always appear as if it
-+came from the host's IP.
-+
-+There are a few other options that are configurable only for the passt
-+backend.  For example, the ``<backend>`` attribute ``logFile`` can be
-+used to tell the passt process for this interface where to write its
-+message log, and the ``<source>`` attribute ``dev`` can tell it a
-+particular host interface to use when deriving the routes given to the
-+guest for forwarding traffic upstream.  Due to the design decisions of
-+passt, when using SELinux on the host, it is recommended that the log
-+file reside in the runtime directory of the user under which the passt
-+process will run, most probably ``/run/user/$UID`` (where ``$UID`` is
-+the UID of that user), e.g. ``/run/user/1000``. Be aware that libvirt
-+does not create this directory if it does not already exist to avoid
-+possible, however unlikely, issues with orphaned directories or
-+permissions, etc. The logfile attribute is meant mostly for debugging,
-+so it shouldn't be set under normal circumstances.
- 
- Additionally, when passt is used, multiple ``<portForward>`` elements
- can be added to forward incoming network traffic for the host to this
-@@ -5164,7 +5204,7 @@ ports **with the exception of some subset**.
-        <backend type='passt' logFile='/run/user/$UID/passt-domain.log'/>
-        <mac address="00:11:22:33:44:55"/>
-        <source dev='eth0'/>
--       <ip family='ipv4' address='172.17.2.4' prefix='24'/>
-+       <ip family='ipv4' address='172.17.5.4' prefix='24'/>
-        <ip family='ipv6' address='2001:db8:ac10:fd01::20'/>
-        <portForward proto='tcp'>
-          <range start='2022' to='22'/>
--- 
-2.48.1
diff --git a/SOURCES/libvirt-domain_conf-initialize-network-hostdev-private-data.patch b/SOURCES/libvirt-domain_conf-initialize-network-hostdev-private-data.patch
new file mode 100644
index 0000000..5296517
--- /dev/null
+++ b/SOURCES/libvirt-domain_conf-initialize-network-hostdev-private-data.patch
@@ -0,0 +1,94 @@
+From 51ada853c575b6361d013e1b594d918d862f873b Mon Sep 17 00:00:00 2001
+Message-ID: <51ada853c575b6361d013e1b594d918d862f873b.1772815374.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Thu, 26 Feb 2026 10:18:23 +0100
+Subject: [PATCH] domain_conf: initialize network hostdev private data
+
+Currently virDomainNetDef and virDomainActualNetDef use
+virDomainHostdevDef directly as structure and the code doesn't call
+virDomainHostdevDefNew() that would initialize private data.
+
+This is hackish quick fix to solve a crash that happens in two
+scenarios:
+
+1. attaching any interface with hostdev backend
+
+0x0000fffbfc0e2a90 in qemuDomainAttachHostPCIDevice (driver=0xfffbb4006750, vm=0xfffbf001f790, hostdev=0xfffbf400b150) at ../src/qemu/qemu_hotplug.c:1652
+1652 if ((ret = qemuFDPassDirectTransferMonitor(hostdevPriv->vfioDeviceFd, priv->mon)) < 0)
+
+2. starting VM with interface with hostdev backend using iommufd
+
+0x00007f6638d5b9ca in qemuProcessOpenVfioDeviceFd (hostdev=hostdev@entry=0x7f6634425ee0) at ../src/qemu/qemu_process.c:7719
+7719	    hostdevPriv->vfioDeviceFd = qemuFDPassDirectNew(name, &vfioDeviceFd);
+
+Proper fix for this issue is to refactor network code to use pointer and to
+use virDomainHostdevDefNew().
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit fe782ed334ea0d4373e6dad093f5815fc925a56b)
+
+https://issues.redhat.com/browse/RHEL-151953
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/conf/domain_conf.c | 23 +++++++++++++++++++++--
+ 1 file changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index cb047e5a3e..df05d96f01 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -3489,6 +3489,20 @@ void virDomainVideoDefFree(virDomainVideoDef *def)
+ }
+ 
+ 
++static int
++virDomainHostdevDefPrivateDataNew(virDomainHostdevDef *def,
++                                  virDomainXMLOption *xmlopt)
++{
++    if (!xmlopt || !xmlopt->privateData.hostdevNew)
++        return 0;
++
++    if (!(def->privateData = xmlopt->privateData.hostdevNew()))
++        return -1;
++
++    return 0;
++}
++
++
+ virDomainHostdevDef *
+ virDomainHostdevDefNew(virDomainXMLOption *xmlopt)
+ {
+@@ -3498,8 +3512,7 @@ virDomainHostdevDefNew(virDomainXMLOption *xmlopt)
+ 
+     def->info = g_new0(virDomainDeviceInfo, 1);
+ 
+-    if (xmlopt && xmlopt->privateData.hostdevNew &&
+-        !(def->privateData = xmlopt->privateData.hostdevNew())) {
++    if (virDomainHostdevDefPrivateDataNew(def, xmlopt) < 0) {
+         VIR_FREE(def->info);
+         VIR_FREE(def);
+         return NULL;
+@@ -9653,6 +9666,9 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
+         virDomainHostdevDef *hostdev = &actual->data.hostdev.def;
+         int type;
+ 
++        if (virDomainHostdevDefPrivateDataNew(hostdev, xmlopt) < 0)
++            goto error;
++
+         hostdev->parentnet = parent;
+         hostdev->info = &parent->info;
+         /* The helper function expects type to already be found and
+@@ -10346,6 +10362,9 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
+         g_autofree char *addrtype = virXPathString("string(./source/address/@type)", ctxt);
+         int type;
+ 
++        if (virDomainHostdevDefPrivateDataNew(&def->data.hostdev.def, xmlopt) < 0)
++            return NULL;
++
+         def->data.hostdev.def.parentnet = def;
+         def->data.hostdev.def.info = &def->info;
+         def->data.hostdev.def.mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS;
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-esx-Accept-empty-path-URI-component-same-way-as.patch b/SOURCES/libvirt-esx-Accept-empty-path-URI-component-same-way-as.patch
deleted file mode 100644
index 93bf0a0..0000000
--- a/SOURCES/libvirt-esx-Accept-empty-path-URI-component-same-way-as.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e9899b64816f8086038098b44690df076d93d8d8 Mon Sep 17 00:00:00 2001
-Message-ID: <e9899b64816f8086038098b44690df076d93d8d8.1744876588.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 8 Apr 2025 16:25:37 +0200
-Subject: [PATCH] esx: Accept empty "path" URI component same way as "/"
-
-When connecting to "esx://" URI there's code which prints a warning that
-the path is not "empty". The check validates that "uri->path" is "/".
-
-In case when the user uses URI such as:
-
- esx://hostname
-
-the warning is printed as well. Since there is no effective difference
-betweeen the two allow empty strings as well.
-
-Resolves: https://issues.redhat.com/browse/RHEL-86459
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 59f40ba67cc7d0a3f8eeb601c2f3c84def24a361)
----
- src/esx/esx_driver.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
-index 6ae4ef9658..512ca6c028 100644
---- a/src/esx/esx_driver.c
-+++ b/src/esx/esx_driver.c
-@@ -687,7 +687,9 @@ esxConnectToVCenter(esxPrivate *priv,
-     g_autofree char *url = NULL;
- 
-     if (!hostSystemIPAddress &&
--        (!priv->parsedUri->path || STREQ(priv->parsedUri->path, "/"))) {
-+        (!priv->parsedUri->path ||
-+         STREQ(priv->parsedUri->path, "") ||
-+         STREQ(priv->parsedUri->path, "/"))) {
-         virReportError(VIR_ERR_INVALID_ARG, "%s",
-                        _("Path has to specify the datacenter and compute resource"));
-         return -1;
-@@ -799,6 +801,7 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
-     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
- 
-     if (STRCASENEQ(conn->uri->scheme, "vpx") &&
-+        STRNEQ(conn->uri->path, "") &&
-         STRNEQ(conn->uri->path, "/")) {
-         VIR_WARN("Ignoring unexpected path '%s' for non-vpx scheme '%s'",
-                  conn->uri->path, conn->uri->scheme);
--- 
-2.49.0
diff --git a/SOURCES/libvirt-esx-Allow-specifying-different-CA-bundle-for-remote-connections.patch b/SOURCES/libvirt-esx-Allow-specifying-different-CA-bundle-for-remote-connections.patch
deleted file mode 100644
index 5114e44..0000000
--- a/SOURCES/libvirt-esx-Allow-specifying-different-CA-bundle-for-remote-connections.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From b554cae09e7870484240b023865bd13fe56878d1 Mon Sep 17 00:00:00 2001
-Message-ID: <b554cae09e7870484240b023865bd13fe56878d1.1752749355.git.jdenemar@redhat.com>
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Mon, 9 Jun 2025 15:40:12 +0200
-Subject: [PATCH] esx: Allow specifying different CA bundle for remote
- connections
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add new URI parameter which allows for using non-system CA certificates
-to verify remote peers.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 6c9a0beeca1c6a54eda5d15ba27925c734d51279)
-
-Resolves: https://issues.redhat.com/browse/RHEL-97440
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
----
- docs/drvesx.rst    | 16 ++++++++++++++--
- src/esx/esx_util.c |  4 ++++
- src/esx/esx_util.h |  1 +
- src/esx/esx_vi.c   |  3 +++
- 4 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/docs/drvesx.rst b/docs/drvesx.rst
-index 13c2bc37e5..84416562ba 100644
---- a/docs/drvesx.rst
-+++ b/docs/drvesx.rst
-@@ -91,7 +91,7 @@ Multiple parameters are separated by ``&``.
- 
- ::
- 
--   ?no_verify=1&auto_answer=1&proxy=socks://example-proxy.com:23456
-+   ?no_verify=1&auto_answer=1&proxy=socks://example-proxy.com:23456&cacert=certs/ca-bundle.pem
- 
- The driver understands the extra parameters shown below.
- 
-@@ -146,6 +146,16 @@ The driver understands the extra parameters shown below.
- |                 |                             | ``port`` allows to override |
- |                 |                             | the default port 1080.      |
- +-----------------+-----------------------------+-----------------------------+
-+| ``cacert``      | Path to a file with one     | The specified file will be  |
-+|                 | or more certificates        | used for verifying the      |
-+|                 |                             | remote host certificate     |
-+|                 |                             | instead of the default      |
-+|                 |                             | system one.                 |
-+|                 |                             | :since:`Since 11.5.0`.      |
-+|                 |                             | Does nothing if             |
-+|                 |                             | ``no_verify`` is set        |
-+|                 |                             | to ``1``.                   |
-++-----------------+-----------------------------+-----------------------------+
- 
- Authentication
- ~~~~~~~~~~~~~~
-@@ -181,8 +191,10 @@ error like this one:
- 
-    error: internal error curl_easy_perform() returned an error: Peer certificate cannot be authenticated with known CA certificates (60)
- 
--Where are two ways to solve this problem:
-+Where are three ways to solve this problem:
- 
-+-  Use the ``cacert`` `Extra parameters`_ to point to a certificate bundle
-+   with the CA that signed the SSL certificate used on the ESX server.
- -  Use the ``no_verify=1`` `Extra parameters`_ to disable server
-    certificate verification.
- -  Generate new SSL certificates signed by a CA known to your client computer
-diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
-index cb9638f360..7ee0e5f7c0 100644
---- a/src/esx/esx_util.c
-+++ b/src/esx/esx_util.c
-@@ -135,6 +135,9 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURI *uri)
-                     goto cleanup;
-                 }
-             }
-+        } else if (STRCASEEQ(queryParam->name, "cacert")) {
-+            g_clear_pointer(&(*parsedUri)->cacert, g_free);
-+            (*parsedUri)->cacert = g_strdup(queryParam->value);
-         } else {
-             VIR_WARN("Ignoring unexpected query parameter '%s'",
-                      queryParam->name);
-@@ -168,6 +171,7 @@ esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri)
-     g_free((*parsedUri)->vCenter);
-     g_free((*parsedUri)->proxy_hostname);
-     g_free((*parsedUri)->path);
-+    g_free((*parsedUri)->cacert);
- 
-     g_free(*parsedUri);
- }
-diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h
-index 088c943e64..58bc44e744 100644
---- a/src/esx/esx_util.h
-+++ b/src/esx/esx_util.h
-@@ -44,6 +44,7 @@ struct _esxUtil_ParsedUri {
-     char *proxy_hostname;
-     int proxy_port;
-     char *path;
-+    char *cacert;
- };
- 
- int esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURI *uri);
-diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
-index 3ecd406e1d..d49daa5bc6 100644
---- a/src/esx/esx_vi.c
-+++ b/src/esx/esx_vi.c
-@@ -343,6 +343,9 @@ esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri)
-                          parsedUri->proxy_port);
-     }
- 
-+    if (parsedUri->cacert)
-+        curl_easy_setopt(curl->handle, CURLOPT_CAINFO, parsedUri->cacert);
-+
-     if (virMutexInit(&curl->lock) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("Could not initialize CURL mutex"));
--- 
-2.50.1
diff --git a/SOURCES/libvirt-esx-URI-encode-inventory-objects-twice.patch b/SOURCES/libvirt-esx-URI-encode-inventory-objects-twice.patch
new file mode 100644
index 0000000..0cf9dde
--- /dev/null
+++ b/SOURCES/libvirt-esx-URI-encode-inventory-objects-twice.patch
@@ -0,0 +1,59 @@
+From 0431af4412aab6aadcde893a7eacf1ae24771590 Mon Sep 17 00:00:00 2001
+Message-ID: <0431af4412aab6aadcde893a7eacf1ae24771590.1768317034.git.jdenemar@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 6 Jan 2026 17:18:03 +0100
+Subject: [PATCH] esx: URI encode inventory objects twice
+
+While discouraged by a KB article to use special characters in
+inventory object names [1], ESX won't stop you. And thus users
+can end up with a datastore named "datastore2+", for instance.
+The datastore name (and datacenter path) are important when
+fetching/uploading a .vmx file (used in APIs like
+virDomainGetXMLDesc() or virDomainDefineXML()). And while we do
+URI encode both (dcPath and dsName), encoding them once is not
+enough. Cole Robinson discovered [2] that they need to be
+URI-encoded twice. Use newly introduced
+esxUtil_EscapeInventoryObject() helper to encode them twice.
+
+1: https://knowledge.broadcom.com/external/article/386368/vcenter-inventory-object-name-with-speci.html
+2: https://issues.redhat.com/browse/RHEL-133729#comment-28604072
+Resolves: https://issues.redhat.com/browse/RHEL-134127
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit 6c9d2591c668732eb05cf17d27c9102ef3d40b39)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/esx/esx_driver.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
+index 9f965811b1..02f30c2b19 100644
+--- a/src/esx/esx_driver.c
++++ b/src/esx/esx_driver.c
+@@ -2567,9 +2567,9 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
+                       domain->conn->uri->server, domain->conn->uri->port);
+     virBufferURIEncodeString(&buffer, directoryAndFileName);
+     virBufferAddLit(&buffer, "?dcPath=");
+-    virBufferURIEncodeString(&buffer, priv->primary->datacenterPath);
++    esxUtil_EscapeInventoryObject(&buffer, priv->primary->datacenterPath);
+     virBufferAddLit(&buffer, "&dsName=");
+-    virBufferURIEncodeString(&buffer, datastoreName);
++    esxUtil_EscapeInventoryObject(&buffer, datastoreName);
+ 
+     url = virBufferContentAndReset(&buffer);
+ 
+@@ -3002,9 +3002,9 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
+ 
+     virBufferURIEncodeString(&buffer, escapedName);
+     virBufferAddLit(&buffer, ".vmx?dcPath=");
+-    virBufferURIEncodeString(&buffer, priv->primary->datacenterPath);
++    esxUtil_EscapeInventoryObject(&buffer, priv->primary->datacenterPath);
+     virBufferAddLit(&buffer, "&dsName=");
+-    virBufferURIEncodeString(&buffer, datastoreName);
++    esxUtil_EscapeInventoryObject(&buffer, datastoreName);
+ 
+     url = virBufferContentAndReset(&buffer);
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-esxConnectListAllDomains-Don-t-propagate-failure-to-lookup-a-single-domain.patch b/SOURCES/libvirt-esxConnectListAllDomains-Don-t-propagate-failure-to-lookup-a-single-domain.patch
deleted file mode 100644
index 0a685b2..0000000
--- a/SOURCES/libvirt-esxConnectListAllDomains-Don-t-propagate-failure-to-lookup-a-single-domain.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7caecd5f75f22d6bab74efcb3bc151f8bf441ec9 Mon Sep 17 00:00:00 2001
-Message-ID: <7caecd5f75f22d6bab74efcb3bc151f8bf441ec9.1744876587.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 25 Mar 2025 07:23:01 +0100
-Subject: [PATCH] esxConnectListAllDomains: Don't propagate failure to lookup a
- single domain
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In esxConnectListAllDomains if the lookup of the VM name and UUID fails
-for a single VM (possible e.g. with broken storage) the whole API would
-return failure even when there are working VMs.
-
-Rework the lookup so that if a subset fails we ignore the failure on
-those. We report an error only if lookup of all of the objects failed.
-Failure is reported from the last one.
-
-Resolves: https://issues.redhat.com/browse/RHEL-80606
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 7d4de62cfa8c684b2d63a48c71f0ae009acddf62)
----
- src/esx/esx_driver.c | 22 ++++++++++++----------
- 1 file changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
-index 554fb3e18f..6ae4ef9658 100644
---- a/src/esx/esx_driver.c
-+++ b/src/esx/esx_driver.c
-@@ -4792,18 +4792,20 @@ esxConnectListAllDomains(virConnectPtr conn,
-          virtualMachine = virtualMachine->_next) {
-         g_autofree char *name = NULL;
- 
--        if (needIdentity) {
--            if (esxVI_GetVirtualMachineIdentity(virtualMachine, &id,
--                                                &name, uuid) < 0) {
--                goto cleanup;
--            }
--        }
-+        /* If the lookup of the required properties fails for some of the machines
-+         * in the list it's preferrable to return the valid objects instead of
-+         * failing outright */
-+        if ((needIdentity && esxVI_GetVirtualMachineIdentity(virtualMachine, &id, &name, uuid) < 0) ||
-+            (needPowerState && esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0)) {
- 
--        if (needPowerState) {
--            if (esxVI_GetVirtualMachinePowerState(virtualMachine,
--                                                  &powerState) < 0) {
-+            /* Raise error only if we didn't successfuly fill any domain */
-+            if (count == 0 && !virtualMachine->_next)
-                 goto cleanup;
--            }
-+
-+            /* failure to fetch information of a single VM must not interrupt
-+             * the lookup of the rest */
-+            virResetLastError();
-+            continue;
-         }
- 
-         /* filter by active state */
--- 
-2.49.0
diff --git a/SOURCES/libvirt-esx_util-Introduce-esxUtil_EscapeInventoryObject.patch b/SOURCES/libvirt-esx_util-Introduce-esxUtil_EscapeInventoryObject.patch
new file mode 100644
index 0000000..e2e358b
--- /dev/null
+++ b/SOURCES/libvirt-esx_util-Introduce-esxUtil_EscapeInventoryObject.patch
@@ -0,0 +1,76 @@
+From 3a1f8bb838db0f412205e2918fc2eb4213f323ad Mon Sep 17 00:00:00 2001
+Message-ID: <3a1f8bb838db0f412205e2918fc2eb4213f323ad.1768317034.git.jdenemar@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Wed, 7 Jan 2026 10:34:25 +0100
+Subject: [PATCH] esx_util: Introduce esxUtil_EscapeInventoryObject()
+
+The aim of this helper function is to URI-encode given string
+twice. There's a bug (fixed in next commit) in which we're unable
+to fetch .vmx file for a domain if corresponding datastore
+contains some special characters (like +). Cole Robinson
+discovered that encoding datastore twice enables libvirt to work
+around the issue [2]. Well, this function does exactly that.
+It was tested with the following inputs and all worked
+flawlessly: "datastore", "datastore2", "datastore2+",
+"datastore3+-@", "data store2+".
+
+1: https://issues.redhat.com/browse/RHEL-134127
+2: https://issues.redhat.com/browse/RHEL-133729#comment-28604072
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit ffe74c7c551bd641cbcaa2512ed0ad4a25d3980b)
+Resolves: https://issues.redhat.com/browse/RHEL-134127
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/esx/esx_util.c | 18 ++++++++++++++++++
+ src/esx/esx_util.h |  3 +++
+ 2 files changed, 21 insertions(+)
+
+diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
+index 7ee0e5f7c0..9b714d90ba 100644
+--- a/src/esx/esx_util.c
++++ b/src/esx/esx_util.c
+@@ -448,3 +448,21 @@ esxUtil_EscapeForXml(const char *string)
+ 
+     return virBufferContentAndReset(&buffer);
+ }
++
++
++/* esxUtil_EscapeInventoryObject:
++ * @buf: the buffer to append to
++ * @string: the string argument which will be URI-encoded
++ *
++ * URI-encode given @string TWICE and append the result to the @buf. This is
++ * to be used with inventory objects (like 'dcPath' and 'dsName') to work
++ * around a VMware bug in which once round of URI-encoding is not enough.
++ */
++void
++esxUtil_EscapeInventoryObject(virBuffer *buf, const char *string)
++{
++    g_autoptr(GString) escaped = g_string_new(NULL);
++
++    g_string_append_uri_escaped(escaped, string, NULL, false);
++    virBufferURIEncodeString(buf, escaped->str);
++}
+diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h
+index 58bc44e744..29f01e0c15 100644
+--- a/src/esx/esx_util.h
++++ b/src/esx/esx_util.h
+@@ -22,6 +22,7 @@
+ #pragma once
+ 
+ #include "internal.h"
++#include "virbuffer.h"
+ #include "viruri.h"
+ 
+ #define ESX_VI_CHECK_ARG_LIST(val) \
+@@ -67,3 +68,5 @@ void esxUtil_ReplaceSpecialWindowsPathChars(char *string);
+ char *esxUtil_EscapeDatastoreItem(const char *string);
+ 
+ char *esxUtil_EscapeForXml(const char *string);
++
++void esxUtil_EscapeInventoryObject(virBuffer *buf, const char *string);
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-include-libvirt-domain-Add-message-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch b/SOURCES/libvirt-include-libvirt-domain-Add-message-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch
deleted file mode 100644
index 9db6ec1..0000000
--- a/SOURCES/libvirt-include-libvirt-domain-Add-message-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From ebe771353b9511ec5850a1415b82399a53fa2c71 Mon Sep 17 00:00:00 2001
-Message-ID: <ebe771353b9511ec5850a1415b82399a53fa2c71.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 24 Jan 2025 16:26:54 +0100
-Subject: [PATCH] include: libvirt-domain: Add 'message' @reason of
- VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In case when the hypervisor does report the reason for the I/O error as
-an unstable string to display to users we can add a @reason possibility
-for the I/O error event noting that the error is available.
-
-Add 'message' as a reason enumeration value and document it
-to instruct users to look at the logs or virDomainGetMessages().
-
-The resulting event looks like:
-
- event 'io-error' for domain 'cd': /dev/mapper/errdev0 (virtio-disk0) report due to message
-
-Users then can look at the virDomainGetMessages() API:
-
- I/O error: disk='vda', index='1', path='/dev/mapper/errdev0', timestamp='2025-01-28 15:47:52.776+0000', message='Input/output error'
-
-Or in the VM log file:
-
- 2025-01-28 15:47:52.776+0000: IO error device='virtio-disk0' node-name='libvirt-1-storage' reason='Input/output error'
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 97c47333cbdc2531260f7b11b1fa9ba828878343)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- include/libvirt/libvirt-domain.h | 4 ++++
- src/qemu/qemu_process.c          | 2 ++
- 2 files changed, 6 insertions(+)
-
-diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index 1dc7b417c9..f026ce197c 100644
---- a/include/libvirt/libvirt-domain.h
-+++ b/include/libvirt/libvirt-domain.h
-@@ -4782,6 +4782,10 @@ typedef void (*virConnectDomainEventIOErrorCallback)(virConnectPtr conn,
-  * - "enospc": The I/O error is known to be caused by an ENOSPC condition in
-  *             the host. Resizing the disk source to be larger will allow the
-  *             guest to be resumed as if nothing happened.
-+ * - "message": The hypervisor reported a string description of the
-+ *              I/O error. The errors are usually logged into the
-+ *              domain log file or the last instance of the error
-+ *              string can be queried via virDomainGetMessages().
-  *
-  * Since: 0.8.1
-  */
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 409734d948..b9d69649ca 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -862,6 +862,8 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
- 
-     if (nospace)
-         eventReason = "enospc";
-+    else if (reason)
-+        eventReason = "message";
- 
-     ioErrorEvent = virDomainEventIOErrorNewFromObj(vm, eventPath, eventAlias, action);
-     ioErrorEvent2 = virDomainEventIOErrorReasonNewFromObj(vm, eventPath, eventAlias, action, eventReason);
--- 
-2.48.1
diff --git a/SOURCES/libvirt-include-libvirt-domain-Reword-documentation-for-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch b/SOURCES/libvirt-include-libvirt-domain-Reword-documentation-for-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch
deleted file mode 100644
index 51da4b0..0000000
--- a/SOURCES/libvirt-include-libvirt-domain-Reword-documentation-for-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5def2eb78e1152a78533e27647eda2352f1dbc4b Mon Sep 17 00:00:00 2001
-Message-ID: <5def2eb78e1152a78533e27647eda2352f1dbc4b.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 27 Jan 2025 15:50:34 +0100
-Subject: [PATCH] include: libvirt-domain: Reword documentation for @reason of
- VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Emphasise that it's an enumeration and convert the possibilities to a
-list of values with explanation.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 3a3c5616eb2c50a58896f99f30d887937dab297a)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- include/libvirt/libvirt-domain.h | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index 92a32f1cde..1dc7b417c9 100644
---- a/include/libvirt/libvirt-domain.h
-+++ b/include/libvirt/libvirt-domain.h
-@@ -4775,11 +4775,13 @@ typedef void (*virConnectDomainEventIOErrorCallback)(virConnectPtr conn,
-  * The callback signature to use when registering for an event of type
-  * VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON with virConnectDomainEventRegisterAny()
-  *
-- * If the I/O error is known to be caused by an ENOSPC condition in
-- * the host (where resizing the disk to be larger will allow the guest
-- * to be resumed as if nothing happened), @reason will be "enospc".
-- * Otherwise, @reason will be "", although future strings may be added
-- * if determination of other error types becomes possible.
-+ * Although @reason is a string, it is considered to be an enumeration of the
-+ * following values:
-+ *
-+ * - "" (empty string): unknown I/O error reason
-+ * - "enospc": The I/O error is known to be caused by an ENOSPC condition in
-+ *             the host. Resizing the disk source to be larger will allow the
-+ *             guest to be resumed as if nothing happened.
-  *
-  * Since: 0.8.1
-  */
--- 
-2.48.1
diff --git a/SOURCES/libvirt-iommufd-fix-FD-leak-in-case-of-error.patch b/SOURCES/libvirt-iommufd-fix-FD-leak-in-case-of-error.patch
new file mode 100644
index 0000000..c896ba7
--- /dev/null
+++ b/SOURCES/libvirt-iommufd-fix-FD-leak-in-case-of-error.patch
@@ -0,0 +1,38 @@
+From 05df8c7309ca3c7db2f5a3c4eb1d07a48aaab486 Mon Sep 17 00:00:00 2001
+Message-ID: <05df8c7309ca3c7db2f5a3c4eb1d07a48aaab486.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Tue, 17 Feb 2026 08:38:07 +0100
+Subject: [PATCH] iommufd: fix FD leak in case of error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reported-by: coverity
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit f37e14119c257281eab4fd1fed1b1018fe4f63b1)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/util/viriommufd.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/viriommufd.c b/src/util/viriommufd.c
+index 1f3353eab4..b62d59241d 100644
+--- a/src/util/viriommufd.c
++++ b/src/util/viriommufd.c
+@@ -87,8 +87,10 @@ virIOMMUFDOpenDevice(void)
+     if ((fd = open(VIR_IOMMU_DEV_PATH, O_RDWR | O_CLOEXEC)) < 0)
+         virReportSystemError(errno, "%s", _("cannot open IOMMUFD device"));
+ 
+-    if (virIOMMUFDSetRLimitMode(fd, true) < 0)
++    if (virIOMMUFDSetRLimitMode(fd, true) < 0) {
++        VIR_FORCE_CLOSE(fd);
+         return -1;
++    }
+ 
+     return fd;
+ }
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-libvirt-domain-introduce-VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES.patch b/SOURCES/libvirt-libvirt-domain-introduce-VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES.patch
deleted file mode 100644
index 76dd0fb..0000000
--- a/SOURCES/libvirt-libvirt-domain-introduce-VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0b2b30820c623e11aced21adb1692ed23430c064 Mon Sep 17 00:00:00 2001
-Message-ID: <0b2b30820c623e11aced21adb1692ed23430c064.1749039441.git.jdenemar@redhat.com>
-From: Collin Walling <walling@linux.ibm.com>
-Date: Mon, 16 Dec 2024 18:03:55 -0500
-Subject: [PATCH] libvirt-domain: introduce
- VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES
-
-Introduce domain flag used to filter deprecated features from the
-domain's CPU model.
-
-Signed-off-by: Collin Walling <walling@linux.ibm.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 4e2c8de2047e21d98443944a2bfe94529b269efa)
-JIRA: https://issues.redhat.com/browse/RHEL-89415
-Signed-off-by: Thomas Huth <thuth@redhat.com>
----
- include/libvirt/libvirt-domain.h | 12 ++++++++++++
- src/libvirt-domain.c             |  2 +-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index c04b696f03..df13b72f7b 100644
---- a/include/libvirt/libvirt-domain.h
-+++ b/include/libvirt/libvirt-domain.h
-@@ -1491,6 +1491,18 @@ int virDomainMigrateGetMaxSpeed(virDomainPtr domain,
- int virDomainMigrateStartPostCopy(virDomainPtr domain,
-                                   unsigned int flags);
- 
-+/**
-+ * virConnectGetDomainCapabilitiesFlags:
-+ *
-+ * Domain capabilities flags.
-+ *
-+ * Since: 11.0.0
-+ */
-+typedef enum {
-+    /* Report host model with deprecated features disabled. (Since: 11.0.0) */
-+    VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES = (1 << 0),
-+} virConnectGetDomainCapabilitiesFlags;
-+
- char * virConnectGetDomainCapabilities(virConnectPtr conn,
-                                        const char *emulatorbin,
-                                        const char *arch,
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index 24752a9888..efc26a41d9 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -12166,7 +12166,7 @@ virDomainSetUserPassword(virDomainPtr dom,
-  * @arch: domain architecture
-  * @machine: machine type
-  * @virttype: virtualization type
-- * @flags: extra flags; not used yet, so callers should always pass 0
-+ * @flags: extra flags; bitwise-OR of virConnectGetDomainCapabilitiesFlags
-  *
-  * Prior creating a domain (for instance via virDomainCreateXML
-  * or virDomainDefineXML) it may be suitable to know what the
--- 
-2.49.0
diff --git a/SOURCES/libvirt-libvirt-host-Clarify-fix-description-of-the-CPU-frequency-field.patch b/SOURCES/libvirt-libvirt-host-Clarify-fix-description-of-the-CPU-frequency-field.patch
deleted file mode 100644
index 81a06ec..0000000
--- a/SOURCES/libvirt-libvirt-host-Clarify-fix-description-of-the-CPU-frequency-field.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a96d1c90832b639c81f6cd893a79610d4379594d Mon Sep 17 00:00:00 2001
-Message-ID: <a96d1c90832b639c81f6cd893a79610d4379594d.1744876587.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 7 Apr 2025 13:35:37 +0200
-Subject: [PATCH] libvirt-host: Clarify/fix description of the CPU frequency
- field
-
-The 'virNodeInfo' field for CPU frequency is named 'mhz'. The docs were
-mentioning 'mHZ', which is neither the field name nor proper spelling of
-the unit.
-
-Reword the paragraph to mention "CPU frequency" instead and explicitly
-name the field in virNodeInfo struct.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit e54cc1500ccfb36cd5b67eb4d886c491fdda5b2b)
-
-https://issues.redhat.com/browse/RHEL-86197
----
- src/libvirt-host.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/libvirt-host.c b/src/libvirt-host.c
-index b3a6421a7f..318a664d24 100644
---- a/src/libvirt-host.c
-+++ b/src/libvirt-host.c
-@@ -410,9 +410,9 @@ virConnectGetMaxVcpus(virConnectPtr conn,
-  * Use of this API is strongly discouraged as the information provided
-  * is not guaranteed to be accurate on all hardware platforms.
-  *
-- * The mHZ value merely reflects the speed that the first CPU in the
-- * machine is currently running at. This speed may vary across CPUs
-- * and changes continually as the host OS throttles.
-+ * The CPU frequency value (field 'mhz' in virNodeInfo) merely reflects the
-+ * speed that the first CPU in the machine is currently running at. This speed
-+ * may vary across CPUs and changes continually as the host OS throttles.
-  *
-  * The nodes/sockets/cores/threads data is potentially inaccurate as
-  * it assumes a symmetric installation. If one NUMA node has more
-@@ -420,7 +420,7 @@ virConnectGetMaxVcpus(virConnectPtr conn,
-  * wrong. It is also not able to report about CPU dies.
-  *
-  * Applications are recommended to use the virConnectGetCapabilities()
-- * call instead, which provides all the information except CPU mHZ,
-+ * call instead, which provides all the information except CPU frequency,
-  * in a more accurate representation.
-  *
-  * Returns 0 in case of success and -1 in case of failure.
--- 
-2.49.0
diff --git a/SOURCES/libvirt-libxl-support-rawset-ACPI-table-type.patch b/SOURCES/libvirt-libxl-support-rawset-ACPI-table-type.patch
deleted file mode 100644
index f1adca5..0000000
--- a/SOURCES/libvirt-libxl-support-rawset-ACPI-table-type.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From fb8c22b5606b2c3d0881df8df05ad1c909b247b2 Mon Sep 17 00:00:00 2001
-Message-ID: <fb8c22b5606b2c3d0881df8df05ad1c909b247b2.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 26 Feb 2025 19:10:42 +0000
-Subject: [PATCH] libxl: support 'rawset' ACPI table type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes representation of the 'acpi_firmware' config in the Xen
-driver, which repesents a concatenation of tables of any type.
-
-Use of 'type=slic' is accepted on input for backwards compatibility.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit dac6ecba6f75bff11fbddb2bce8ca9b576ea6a74)
-Resolves: https://issues.redhat.com/browse/RHEL-81041
----
- docs/formatdomain.rst                          | 2 +-
- src/libxl/libxl_domain.c                       | 5 +++--
- src/libxl/xen_xl.c                             | 2 +-
- tests/xlconfigdata/test-fullvirt-acpi-slic.xml | 2 +-
- 4 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index ff06efb69f..b03b5317aa 100644
---- a/docs/formatdomain.rst
-+++ b/docs/formatdomain.rst
-@@ -492,7 +492,7 @@ These options apply to any form of booting of the guest OS.
-      signature auto-detected from header (:since:`Since 11.2.0 (QEMU)`).
-    * ``rawset``: concatenation of multiple ACPI tables with header
-      and data, each with any ACPI signature, auto-detected from header
--     (:since:`Since 11.2.0`).
-+     (:since:`Since 11.2.0 (Xen)`).
-    * ``slic``: a single ACPI table with header and data, providing
-      software licensing information. The ACPI table signature in the
-      header will be forced to ``SLIC`` (:since:`Since 1.3.5 (QEMU)`,
-diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
-index e564d9e5fe..e31d92d903 100644
---- a/src/libxl/libxl_domain.c
-+++ b/src/libxl/libxl_domain.c
-@@ -333,11 +333,12 @@ libxlDomainDefValidate(const virDomainDef *def,
- 
-     for (i = 0; i < def->os.nacpiTables; i++) {
-         switch (def->os.acpiTables[i]->type) {
--        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC:
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC: /* Back compat for historical mistake,
-+                                                  * functionally the same as 'rawset' */
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET:
-             break;
- 
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW:
--        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET:
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("ACPI table type '%1$s' is not supported"),
-                            virDomainOsACPITableTypeToString(def->os.acpiTables[i]->type));
-diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
-index 062b753cea..9d06315661 100644
---- a/src/libxl/xen_xl.c
-+++ b/src/libxl/xen_xl.c
-@@ -140,7 +140,7 @@ xenParseXLOS(virConf *conf, virDomainDef *def, virCaps *caps)
-             def->os.nacpiTables = 1;
-             def->os.acpiTables = g_new0(virDomainOSACPITableDef *, 1);
-             def->os.acpiTables[0] = g_new0(virDomainOSACPITableDef, 1);
--            def->os.acpiTables[0]->type = VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC;
-+            def->os.acpiTables[0]->type = VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET;
-             def->os.acpiTables[0]->path = g_steal_pointer(&slic);
-         }
- 
-diff --git a/tests/xlconfigdata/test-fullvirt-acpi-slic.xml b/tests/xlconfigdata/test-fullvirt-acpi-slic.xml
-index 366d877624..bf617e5e05 100644
---- a/tests/xlconfigdata/test-fullvirt-acpi-slic.xml
-+++ b/tests/xlconfigdata/test-fullvirt-acpi-slic.xml
-@@ -8,7 +8,7 @@
-     <type arch='x86_64' machine='xenfv'>hvm</type>
-     <loader type='rom' format='raw'>/usr/lib/xen/boot/hvmloader</loader>
-     <acpi>
--      <table type='slic'>/sys/firmware/acpi/tables/SLIC</table>
-+      <table type='rawset'>/sys/firmware/acpi/tables/SLIC</table>
-     </acpi>
-     <boot dev='cdrom'/>
-   </os>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-libxlDomainGetMessages-Add-existing-flags-to-virCheckFlags.patch b/SOURCES/libvirt-libxlDomainGetMessages-Add-existing-flags-to-virCheckFlags.patch
deleted file mode 100644
index 390dd7b..0000000
--- a/SOURCES/libvirt-libxlDomainGetMessages-Add-existing-flags-to-virCheckFlags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c417e164d2b225ea401093e33a853d827d8bd8ca Mon Sep 17 00:00:00 2001
-Message-ID: <c417e164d2b225ea401093e33a853d827d8bd8ca.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 28 Jan 2025 14:06:16 +0100
-Subject: [PATCH] libxlDomainGetMessages: Add existing flags to 'virCheckFlags'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The two VIR_DOMAIN_MESSAGE_* flags were not listed in the virCheckFlags
-check in 'libxl' but were present in 'test' and 'qemu' driver impls.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 042ea8630b1b35ce6d325df52fefa84bad94d027)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/libxl/libxl_driver.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index e72553603d..26d22550ae 100644
---- a/src/libxl/libxl_driver.c
-+++ b/src/libxl/libxl_driver.c
-@@ -6575,7 +6575,8 @@ libxlDomainGetMessages(virDomainPtr dom,
-     virDomainObj *vm = NULL;
-     int ret = -1;
- 
--    virCheckFlags(0, -1);
-+    virCheckFlags(VIR_DOMAIN_MESSAGE_DEPRECATION |
-+                  VIR_DOMAIN_MESSAGE_TAINTING, -1);
- 
-     if (!(vm = libxlDomObjFromDomain(dom)))
-         return -1;
--- 
-2.48.1
diff --git a/SOURCES/libvirt-manpages-virsh-Use-disclaimer-from-virNodeGetInfo-for-virsh-nodeinfo.patch b/SOURCES/libvirt-manpages-virsh-Use-disclaimer-from-virNodeGetInfo-for-virsh-nodeinfo.patch
deleted file mode 100644
index ac94a0c..0000000
--- a/SOURCES/libvirt-manpages-virsh-Use-disclaimer-from-virNodeGetInfo-for-virsh-nodeinfo.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 90859b9c9cda1ab3daa34847ac4608cf451102ce Mon Sep 17 00:00:00 2001
-Message-ID: <90859b9c9cda1ab3daa34847ac4608cf451102ce.1744876588.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 7 Apr 2025 14:58:41 +0200
-Subject: [PATCH] manpages: virsh: Use disclaimer from 'virNodeGetInfo()' for
- 'virsh nodeinfo'
-
-Adapt the disclarimer about the data not being accurate in many cases
-from the API docs to the virsh command using the aforementioned API.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 617e2dc3194204a88309e3da55bec8743a5df2ea)
-
-https://issues.redhat.com/browse/RHEL-86197
----
- docs/manpages/virsh.rst | 23 +++++++++++++++++++----
- 1 file changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
-index 2e525d3fac..aea920b7a7 100644
---- a/docs/manpages/virsh.rst
-+++ b/docs/manpages/virsh.rst
-@@ -427,10 +427,25 @@ nodeinfo
-    nodeinfo
- 
- Returns basic information about the node, like number and type of CPU,
--and size of the physical memory. The output corresponds to virNodeInfo
--structure. Specifically, the "CPU socket(s)" field means number of CPU
--sockets per NUMA cell. The information libvirt displays is dependent
--upon what each architecture may provide.
-+and size of the physical memory.
-+
-+Use of this command is strongly discouraged as the information provided
-+is not guaranteed to be accurate on all hardware platforms.
-+
-+The *CPU frequency* value merely reflects the speed that the first CPU in the
-+machine is currently running at. This speed may vary across CPUs and changes
-+continually as the host OS throttles.
-+
-+The data structure used to fetch the data is not extensible thus only supports
-+global nodes/sockets/cores/threads (sockets/cores/threads is per NUMA node)
-+topology information. If the host CPU has any further groupings (e.g.
-+dies, clusters, etc) or the NUMA topology is non-symmetrical the data structure
-+can't faithfully represent the system. In such cases a fake topology
-+(nodes = 1, sockets = 1, cores = number of host cpus, threads = 1) which
-+only correctly represents the total host CPU count is reported.
-+
-+Recommended replacement is to use the *capabilities* command which reports
-+the data (except frequency) under ``/capabilities/host/topology`` XPath.
- 
- 
- nodecpumap
--- 
-2.49.0
diff --git a/SOURCES/libvirt-network-Free-inhibitor-in-networkStateCleanup.patch b/SOURCES/libvirt-network-Free-inhibitor-in-networkStateCleanup.patch
deleted file mode 100644
index e6883dc..0000000
--- a/SOURCES/libvirt-network-Free-inhibitor-in-networkStateCleanup.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2ea12b6f6eed044dd7100ed19565319227f7384f Mon Sep 17 00:00:00 2001
-Message-ID: <2ea12b6f6eed044dd7100ed19565319227f7384f.1742990721.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 13 Mar 2025 13:01:19 +0100
-Subject: [PATCH] network: Free inhibitor in networkStateCleanup()
-
-The shutdown inhibitor is created in networkStateInitialize() but
-corresponding call to virInhibitorFree() is missing in
-networkStateCleanup() leading to a memleak:
-
-116 (72 direct, 44 indirect) bytes in 1 blocks are definitely lost in loss record 1,769 of 1,998
-   at 0x484CEF3: calloc (vg_replace_malloc.c:1675)
-   by 0x4F0E7A9: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.8000.5)
-   by 0x4993B9B: virInhibitorNew (virinhibitor.c:152)
-   by 0x5279394: networkStateInitialize (bridge_driver.c:654)
-   by 0x4CC74DC: virStateInitialize (libvirt.c:665)
-   by 0x15B719: daemonRunStateInit (remote_daemon.c:613)
-   by 0x49F2B44: virThreadHelper (virthread.c:256)
-   by 0x5356662: start_thread (in /usr/lib64/libc.so.6)
-   by 0x53D7DA3: clone (in /usr/lib64/libc.so.6)
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 8701ba4feb528109da8b72fa48a8ada50a235807)
-Resolves: https://issues.redhat.com/browse/RHEL-83064
----
- src/network/bridge_driver.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
-index ce793c12ef..adcff6f34f 100644
---- a/src/network/bridge_driver.c
-+++ b/src/network/bridge_driver.c
-@@ -802,6 +802,8 @@ networkStateCleanup(void)
-                           network_driver->lockFD);
-     }
- 
-+    virInhibitorFree(network_driver->inhibitor);
-+
-     virObjectUnref(network_driver->config);
-     virObjectUnref(network_driver->dnsmasqCaps);
- 
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-Add-support-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch b/SOURCES/libvirt-qemu-Add-support-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch
deleted file mode 100644
index c78f850..0000000
--- a/SOURCES/libvirt-qemu-Add-support-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From aeff1ebf96b595337f14ef6d1412d6c407bdc085 Mon Sep 17 00:00:00 2001
-Message-ID: <aeff1ebf96b595337f14ef6d1412d6c407bdc085.1747908717.git.jdenemar@redhat.com>
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Tue, 25 Feb 2025 15:36:32 +0100
-Subject: [PATCH] qemu: Add support for VIR_DOMAIN_GUEST_INFO_LOAD
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit b4cf9c8cba45e65551aa9440dea2c3757a96aa0c)
-
-https://issues.redhat.com/browse/RHEL-88447
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
----
- src/qemu/qemu_driver.c | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 8a354a606a..11dbbc1aab 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -19276,7 +19276,8 @@ static const unsigned int qemuDomainGetGuestInfoSupportedTypes =
-     VIR_DOMAIN_GUEST_INFO_HOSTNAME |
-     VIR_DOMAIN_GUEST_INFO_FILESYSTEM |
-     VIR_DOMAIN_GUEST_INFO_DISKS |
--    VIR_DOMAIN_GUEST_INFO_INTERFACES;
-+    VIR_DOMAIN_GUEST_INFO_INTERFACES |
-+    VIR_DOMAIN_GUEST_INFO_LOAD;
- 
- static int
- qemuDomainGetGuestInfoCheckSupport(unsigned int types,
-@@ -19563,6 +19564,10 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
-     qemuAgentDiskInfo **agentdiskinfo = NULL;
-     virDomainInterfacePtr *ifaces = NULL;
-     size_t nifaces = 0;
-+    double load1m = 0;
-+    double load5m = 0;
-+    double load15m = 0;
-+    bool format_load = false;
-     size_t i;
- 
-     virCheckFlags(0, -1);
-@@ -19633,6 +19638,14 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
-             nifaces = rc;
-     }
- 
-+    if (supportedTypes & VIR_DOMAIN_GUEST_INFO_LOAD) {
-+        rc = qemuAgentGetLoadAvg(agent, &load1m, &load5m, &load15m, report_unsupported);
-+        if (rc == -1)
-+            goto exitagent;
-+        if (rc >= 0)
-+            format_load = true;
-+    }
-+
-     qemuDomainObjExitAgent(vm, agent);
-     virDomainObjEndAgentJob(vm);
- 
-@@ -19659,6 +19672,12 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
-         virDomainInterfaceFormatParams(ifaces, nifaces, params, nparams, &maxparams);
-     }
- 
-+    if (format_load) {
-+        virTypedParamsAddDouble(params, nparams, &maxparams, "load.1m", load1m);
-+        virTypedParamsAddDouble(params, nparams, &maxparams, "load.5m", load5m);
-+        virTypedParamsAddDouble(params, nparams, &maxparams, "load.15m", load15m);
-+    }
-+
-     ret = 0;
- 
-  cleanup:
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-Add-support-for-direct-and-extended-tlbflush-features.patch b/SOURCES/libvirt-qemu-Add-support-for-direct-and-extended-tlbflush-features.patch
deleted file mode 100644
index 57049f7..0000000
--- a/SOURCES/libvirt-qemu-Add-support-for-direct-and-extended-tlbflush-features.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 64ca9249f100a61cf39e800ad67f0dd520aabb5d Mon Sep 17 00:00:00 2001
-Message-ID: <64ca9249f100a61cf39e800ad67f0dd520aabb5d.1737030652.git.jdenemar@redhat.com>
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Fri, 20 Dec 2024 12:28:24 +0100
-Subject: [PATCH] qemu: Add support for direct and extended tlbflush features
-
-They require special handling since they are dependent on the basic
-tlbflush feature itself and therefore are not handled automatically as
-part of virDomainHyperv enum, just like the stimer-direct feature.
-
-Resolves: https://issues.redhat.com/browse/RHEL-7122
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 247357cc292a83c8628592562cbb4fa621cdc5b0)
-
-https://issues.redhat.com/browse/RHEL-7122
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
----
- src/qemu/qemu_command.c                       |  6 +++++
- src/qemu/qemu_process.c                       | 24 +++++++++++++++++++
- .../qemuxmlconfdata/hyperv.x86_64-latest.args |  2 +-
- tests/qemuxmlconfdata/hyperv.xml              |  5 +++-
- 4 files changed, 35 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index dcb9c4934e..1f28de6194 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6350,6 +6350,12 @@ qemuBuildCpuCommandLine(virCommand *cmd,
-                 if ((i == VIR_DOMAIN_HYPERV_STIMER) &&
-                     (def->hyperv_stimer_direct == VIR_TRISTATE_SWITCH_ON))
-                     virBufferAsprintf(&buf, ",%s=on", VIR_CPU_x86_HV_STIMER_DIRECT);
-+                if (i == VIR_DOMAIN_HYPERV_TLBFLUSH) {
-+                    if (def->hyperv_tlbflush_direct == VIR_TRISTATE_SWITCH_ON)
-+                        virBufferAsprintf(&buf, ",%s=on", VIR_CPU_x86_HV_TLBFLUSH_DIRECT);
-+                    if (def->hyperv_tlbflush_extended == VIR_TRISTATE_SWITCH_ON)
-+                        virBufferAsprintf(&buf, ",%s=on", VIR_CPU_x86_HV_TLBFLUSH_EXT);
-+                }
-                 break;
- 
-             case VIR_DOMAIN_HYPERV_SPINLOCKS:
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index bee7a39e4e..7297263d33 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -4281,6 +4281,30 @@ qemuProcessVerifyHypervFeatures(virDomainDef *def,
-                                "direct");
-                 return -1;
-             }
-+            if (i == VIR_DOMAIN_HYPERV_TLBFLUSH) {
-+                if (def->hyperv_tlbflush_direct == VIR_TRISTATE_SWITCH_ON) {
-+                    rc = virCPUDataCheckFeature(cpu, VIR_CPU_x86_HV_TLBFLUSH_DIRECT);
-+                    if (rc < 0)
-+                        return -1;
-+                    if (rc == 0) {
-+                        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                                       _("host doesn't support hyperv tlbflush '%1$s' feature"),
-+                                       "direct");
-+                        return -1;
-+                    }
-+                }
-+                if (def->hyperv_tlbflush_extended == VIR_TRISTATE_SWITCH_ON) {
-+                    rc = virCPUDataCheckFeature(cpu, VIR_CPU_x86_HV_TLBFLUSH_EXT);
-+                    if (rc < 0)
-+                        return -1;
-+                    if (rc == 0) {
-+                        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                                       _("host doesn't support hyperv tlbflush '%1$s' feature"),
-+                                       "extended");
-+                        return -1;
-+                    }
-+                }
-+            }
-             continue;
-         }
- 
-diff --git a/tests/qemuxmlconfdata/hyperv.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv.x86_64-latest.args
-index 2aafafb340..5a32b80e71 100644
---- a/tests/qemuxmlconfdata/hyperv.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/hyperv.x86_64-latest.args
-@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
- -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=on \
- -accel tcg \
---cpu 'qemu64,hv-relaxed=on,hv-vapic=on,hv-spinlocks=0x2fff,hv-vpindex=on,hv-runtime=on,hv-synic=on,hv-stimer=on,hv-reset=on,hv-vendor-id=KVM Hv,hv-frequencies=on,hv-reenlightenment=on,hv-tlbflush=on,hv-ipi=on,hv-evmcs=on,hv-avic=on,hv-emsr-bitmap=on,hv-xmm-input=on' \
-+-cpu 'qemu64,hv-relaxed=on,hv-vapic=on,hv-spinlocks=0x2fff,hv-vpindex=on,hv-runtime=on,hv-synic=on,hv-stimer=on,hv-reset=on,hv-vendor-id=KVM Hv,hv-frequencies=on,hv-reenlightenment=on,hv-tlbflush=on,hv-tlbflush-direct=on,hv-tlbflush-ext=on,hv-ipi=on,hv-evmcs=on,hv-avic=on,hv-emsr-bitmap=on,hv-xmm-input=on' \
- -m size=219136k \
- -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxmlconfdata/hyperv.xml b/tests/qemuxmlconfdata/hyperv.xml
-index a1e3cbbdf8..8c323f6578 100644
---- a/tests/qemuxmlconfdata/hyperv.xml
-+++ b/tests/qemuxmlconfdata/hyperv.xml
-@@ -22,7 +22,10 @@
-       <vendor_id state='on' value='KVM Hv'/>
-       <frequencies state='on'/>
-       <reenlightenment state='on'/>
--      <tlbflush state='on'/>
-+      <tlbflush state='on'>
-+        <direct state='on'/>
-+        <extended state='on'/>
-+      </tlbflush>
-       <ipi state='on'/>
-       <evmcs state='on'/>
-       <avic state='on'/>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-qemu-Allow-virtio-mem-on-CCW.patch b/SOURCES/libvirt-qemu-Allow-virtio-mem-on-CCW.patch
deleted file mode 100644
index 6eda024..0000000
--- a/SOURCES/libvirt-qemu-Allow-virtio-mem-on-CCW.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5c4270439f99bd52f91613a6ee833aa4bcb131c4 Mon Sep 17 00:00:00 2001
-Message-ID: <5c4270439f99bd52f91613a6ee833aa4bcb131c4.1744876588.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 15 Jan 2025 13:00:36 +0100
-Subject: [PATCH] qemu: Allow virtio-mem on CCW
-
-After previous commits, we can allow virtio-mem to live on CCW
-channel.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit ee0320a7fccc8088bc2830fe949ae2339db208cb)
-Resolves: https://issues.redhat.com/browse/RHEL-72976
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_domain.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index b6c36d85d7..4234e4605b 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -7673,9 +7673,10 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem,
- 
-     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
-         if (mem->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI &&
-+            mem->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW &&
-             mem->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--                           _("only 'pci' addresses are supported for the %1$s device"),
-+                           _("only 'pci' and 'ccw' addresses are supported for the %1$s device"),
-                            virDomainMemoryModelTypeToString(mem->model));
-             return -1;
-         }
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-Avoid-crash-in-qemuDomainCheckCPU-with-unknown-host-CPU.patch b/SOURCES/libvirt-qemu-Avoid-crash-in-qemuDomainCheckCPU-with-unknown-host-CPU.patch
deleted file mode 100644
index 7eb1537..0000000
--- a/SOURCES/libvirt-qemu-Avoid-crash-in-qemuDomainCheckCPU-with-unknown-host-CPU.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d874530eaded03d0b90139c9bbd80902b9464e87 Mon Sep 17 00:00:00 2001
-Message-ID: <d874530eaded03d0b90139c9bbd80902b9464e87.1741876175.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 18 Feb 2025 11:24:32 +0100
-Subject: [PATCH] qemu: Avoid crash in qemuDomainCheckCPU with unknown host CPU
-
-When we don't have any information about host CPU (for example when
-running on an aarch64 host), the virQEMUCapsGetHostModel would return
-NULL.
-
-Fixes: f928eb5fc80ca0ed7277f2513b63aed36c09d275
-Fixes: https://gitlab.com/libvirt/libvirt/-/issues/747
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Tested-by: Jaroslav Suchanek <jsuchane@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 43eae1b7077104d4e2ed52447407a335c2d093e3)
-
-https://issues.redhat.com/browse/RHEL-81747
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_domain.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 92035dd281..1ccaff90d9 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -11446,6 +11446,7 @@ qemuDomainCheckCPU(virArch arch,
-     /* Force compat check if the CPU model is not found in qemuCaps or
-      * we don't have host CPU data from QEMU */
-     if (!cpu->model ||
-+        !hypervisorCPU ||
-         hypervisorCPU->fallback != VIR_CPU_FALLBACK_FORBID ||
-         virQEMUCapsGetCPUBlockers(qemuCaps, virtType,
-                                   cpu->model, &blockers) < 0)
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-Convert-IOMMUFD-to-qemuFDPassDirect.patch b/SOURCES/libvirt-qemu-Convert-IOMMUFD-to-qemuFDPassDirect.patch
new file mode 100644
index 0000000..97e45a3
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Convert-IOMMUFD-to-qemuFDPassDirect.patch
@@ -0,0 +1,125 @@
+From ca83d49a04eb50ecb5bff8dde9928a9c15764fee Mon Sep 17 00:00:00 2001
+Message-ID: <ca83d49a04eb50ecb5bff8dde9928a9c15764fee.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 19:42:39 +0100
+Subject: [PATCH] qemu: Convert IOMMUFD to qemuFDPassDirect
+
+This cleans up creating QEMU command line and makes it easier when
+adding hotplug support.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit df59beed37db5451a44955c1c440eebc474bffb2)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_command.c | 7 ++-----
+ src/qemu/qemu_domain.c  | 4 ++--
+ src/qemu/qemu_domain.h  | 2 +-
+ src/qemu/qemu_process.c | 6 ++++--
+ tests/qemuxmlconftest.c | 6 ++++--
+ 5 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 482f8d8ca2..0057934cc6 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -5350,19 +5350,16 @@ qemuBuildIOMMUFDCommandLine(virCommand *cmd,
+                             virDomainObj *vm)
+ {
+     qemuDomainObjPrivate *priv = vm->privateData;
+-    g_autofree char *fdstr = g_strdup_printf("%d", priv->iommufd);
+     g_autoptr(virJSONValue) props = NULL;
+ 
+     if (!virDomainDefHasPCIHostdevWithIOMMUFD(def))
+         return 0;
+ 
+-    virCommandPassFD(cmd, priv->iommufd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
+-
+-    priv->iommufd = -1;
++    qemuFDPassDirectTransferCommand(priv->iommufd, cmd);
+ 
+     if (qemuMonitorCreateObjectProps(&props, "iommufd",
+                                      "iommufd0",
+-                                     "S:fd", fdstr,
++                                     "S:fd", qemuFDPassDirectGetPath(priv->iommufd),
+                                      NULL) < 0)
+         return -1;
+ 
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 64b01e524f..d9cd9324e0 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1975,7 +1975,7 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivate *priv)
+ 
+     priv->migrationRecoverSetup = false;
+ 
+-    VIR_FORCE_CLOSE(priv->iommufd);
++    g_clear_pointer(&priv->iommufd, qemuFDPassDirectFree);
+ 
+     g_clear_pointer(&priv->memoryBackingDir, g_free);
+ }
+@@ -2044,7 +2044,7 @@ qemuDomainObjPrivateAlloc(void *opaque)
+     priv->blockjobs = virHashNew(virObjectUnref);
+     priv->fds = virHashNew(g_object_unref);
+ 
+-    priv->iommufd = -1;
++    priv->iommufd = NULL;
+     priv->pidMonitored = -1;
+ 
+     /* agent commands block by default, user can choose different behavior */
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index 30ca67bf76..a5403ecc93 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -264,7 +264,7 @@ struct _qemuDomainObjPrivate {
+     /* named file descriptor groups associated with the VM */
+     GHashTable *fds;
+ 
+-    int iommufd;
++    qemuFDPassDirect *iommufd;
+ 
+     char *memoryBackingDir;
+ };
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 3729edcd7e..91167d73bc 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7685,13 +7685,15 @@ static int
+ qemuProcessOpenIommuFd(virDomainObj *vm)
+ {
+     qemuDomainObjPrivate *priv = vm->privateData;
++    int iommufd;
+ 
+     VIR_DEBUG("Opening IOMMU FD for domain %s", vm->def->name);
+ 
+-    if ((priv->iommufd = virIOMMUFDOpenDevice()) < 0)
++    if ((iommufd = virIOMMUFDOpenDevice()) < 0)
+         return -1;
+ 
+-    VIR_DEBUG("Opened IOMMU FD %d for domain %s", priv->iommufd, vm->def->name);
++    priv->iommufd = qemuFDPassDirectNew("iommufd", &iommufd);
++
+     return 0;
+ }
+ 
+diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
+index 885512a38c..eeb9298b2e 100644
+--- a/tests/qemuxmlconftest.c
++++ b/tests/qemuxmlconftest.c
+@@ -406,8 +406,10 @@ testQemuPrepareHostdev(virDomainObj *vm)
+         }
+     }
+ 
+-    if (virDomainDefHasPCIHostdevWithIOMMUFD(vm->def))
+-        priv->iommufd = 0;
++    if (virDomainDefHasPCIHostdevWithIOMMUFD(vm->def)) {
++        int iommufd = 0;
++        priv->iommufd = qemuFDPassDirectNew("iommufd", &iommufd);
++    }
+ }
+ 
+ 
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-Convert-vfioDeviceFd-to-qemuFDPassDirect.patch b/SOURCES/libvirt-qemu-Convert-vfioDeviceFd-to-qemuFDPassDirect.patch
new file mode 100644
index 0000000..6411357
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Convert-vfioDeviceFd-to-qemuFDPassDirect.patch
@@ -0,0 +1,129 @@
+From 24b8d8f936dcff1a78dda3253876f9242b3ec98b Mon Sep 17 00:00:00 2001
+Message-ID: <24b8d8f936dcff1a78dda3253876f9242b3ec98b.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 19:28:16 +0100
+Subject: [PATCH] qemu: Convert vfioDeviceFd to qemuFDPassDirect
+
+This cleans up creating QEMU command line and makes it easier when
+adding hotplug support.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 4611f227c7882c8b9237da5e2fab21932ef6bd51)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_command.c | 15 +++++----------
+ src/qemu/qemu_domain.c  |  4 ++--
+ src/qemu/qemu_domain.h  |  2 +-
+ src/qemu/qemu_process.c |  6 +++++-
+ tests/qemuxmlconftest.c |  4 +++-
+ 5 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 0057934cc6..8038aa3115 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -4811,12 +4811,10 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
+         pcisrc->driver.iommufd == VIR_TRISTATE_BOOL_YES) {
+         qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(dev);
+ 
+-        if (hostdevPriv->vfioDeviceFd != -1) {
+-            g_autofree char *fdstr = g_strdup_printf("%d", hostdevPriv->vfioDeviceFd);
+-            if (virJSONValueObjectAdd(&props, "S:fd", fdstr, NULL) < 0)
+-                return NULL;
+-            hostdevPriv->vfioDeviceFd = -1;
+-        }
++        if (virJSONValueObjectAdd(&props,
++                                  "S:fd", qemuFDPassDirectGetPath(hostdevPriv->vfioDeviceFd),
++                                  NULL) < 0)
++            return NULL;
+     }
+ 
+     if (qemuBuildDeviceAddressProps(props, def, dev->info) < 0)
+@@ -5266,10 +5264,7 @@ qemuBuildHostdevCommandLine(virCommand *cmd,
+             if (subsys->u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES) {
+                 qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
+ 
+-                if (hostdevPriv->vfioDeviceFd != -1) {
+-                    virCommandPassFD(cmd, hostdevPriv->vfioDeviceFd,
+-                                     VIR_COMMAND_PASS_FD_CLOSE_PARENT);
+-                }
++                qemuFDPassDirectTransferCommand(hostdevPriv->vfioDeviceFd, cmd);
+             }
+ 
+             if (!(devprops = qemuBuildPCIHostdevDevProps(def, hostdev)))
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index d9cd9324e0..ada9d3431c 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1245,7 +1245,7 @@ qemuDomainHostdevPrivateDispose(void *obj)
+ {
+     qemuDomainHostdevPrivate *priv = obj;
+ 
+-    VIR_FORCE_CLOSE(priv->vfioDeviceFd);
++    g_clear_pointer(&priv->vfioDeviceFd, qemuFDPassDirectFree);
+ }
+ 
+ 
+@@ -1271,7 +1271,7 @@ qemuDomainHostdevPrivateNew(void)
+     if (!(priv = virObjectNew(qemuDomainHostdevPrivateClass)))
+         return NULL;
+ 
+-    priv->vfioDeviceFd = -1;
++    priv->vfioDeviceFd = NULL;
+ 
+     return (virObject *) priv;
+ }
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index a5403ecc93..8aa94fc25b 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -471,7 +471,7 @@ struct _qemuDomainHostdevPrivate {
+     virObject parent;
+ 
+     /* VFIO device file descriptor for iommufd passthrough */
+-    int vfioDeviceFd;
++    qemuFDPassDirect *vfioDeviceFd;
+ };
+ 
+ 
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 91167d73bc..59fff1aa19 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7710,10 +7710,14 @@ qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev)
+ {
+     qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
+     virDomainHostdevSubsysPCI *pci = &hostdev->source.subsys.u.pci;
++    g_autofree char *name = g_strdup_printf("hostdev-%s-fd", hostdev->info->alias);
++    int vfioDeviceFd;
+ 
+-    if ((hostdevPriv->vfioDeviceFd = virPCIDeviceOpenVfioFd(&pci->addr)) < 0)
++    if ((vfioDeviceFd = virPCIDeviceOpenVfioFd(&pci->addr)) < 0)
+         return -1;
+ 
++    hostdevPriv->vfioDeviceFd = qemuFDPassDirectNew(name, &vfioDeviceFd);
++
+     return 0;
+ }
+ 
+diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
+index eeb9298b2e..aa877bf16a 100644
+--- a/tests/qemuxmlconftest.c
++++ b/tests/qemuxmlconftest.c
+@@ -357,8 +357,10 @@ testQemuPrepareHostdevPCI(virDomainHostdevDef *hostdev)
+     qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
+ 
+     if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) {
++        g_autofree char *name = g_strdup_printf("hostdev-%s-fd", hostdev->info->alias);
+         /* Use a placeholder FD value for tests */
+-        hostdevPriv->vfioDeviceFd = 0;
++        int vfioDeviceFD = 0;
++        hostdevPriv->vfioDeviceFd = qemuFDPassDirectNew(name, &vfioDeviceFD);
+     }
+ }
+ 
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-Do-NOT-autoadd-NUMA-node-for-s390.patch b/SOURCES/libvirt-qemu-Do-NOT-autoadd-NUMA-node-for-s390.patch
deleted file mode 100644
index 80f172f..0000000
--- a/SOURCES/libvirt-qemu-Do-NOT-autoadd-NUMA-node-for-s390.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b2e5469f35657b7d46842b39be04ecc34e5ff659 Mon Sep 17 00:00:00 2001
-Message-ID: <b2e5469f35657b7d46842b39be04ecc34e5ff659.1744876588.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 20 Jan 2025 17:10:24 +0100
-Subject: [PATCH] qemu: Do NOT autoadd NUMA node for s390
-
-In some cases, we might automatically add a NUMA node. But this
-doesn't work for s390 really, because in its commit
-v2.12.0-rc0~41^2~6 QEMU forbade specifying NUMA nodes for s390.
-Suppress automatic adding of NUMA node on our side.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: David Hildenbrand <david@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit a8ed747b9a8c5cbd07557edc66962bc26205d7fb)
-Resolves: https://issues.redhat.com/browse/RHEL-72976
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_domain.c    | 3 ++-
- src/qemu/qemu_postparse.c | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 89e1b50366..b6c36d85d7 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -7761,7 +7761,8 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
-         return 0;
-     }
- 
--    if (!ARCH_IS_PPC64(def->os.arch)) {
-+    if (!ARCH_IS_PPC64(def->os.arch) &&
-+        !ARCH_IS_S390(def->os.arch)) {
-         /* due to guest support, qemu would silently enable NUMA with one node
-          * once the memory hotplug backend is enabled. To avoid possible
-          * confusion we will enforce user originated numa configuration along
-diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c
-index 892330646a..141847b0ef 100644
---- a/src/qemu/qemu_postparse.c
-+++ b/src/qemu/qemu_postparse.c
-@@ -1806,6 +1806,7 @@ qemuDomainDefNumaAutoAdd(virDomainDef *def,
- 
-     if (!abiUpdate ||
-         !virDomainDefHasMemoryHotplug(def) ||
-+        qemuDomainIsS390CCW(def) ||
-         virDomainNumaGetNodeCount(def->numa) > 0) {
-         return 0;
-     }
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-Enable-I-O-APIC-even-more-frequently.patch b/SOURCES/libvirt-qemu-Enable-I-O-APIC-even-more-frequently.patch
deleted file mode 100644
index 7110dbe..0000000
--- a/SOURCES/libvirt-qemu-Enable-I-O-APIC-even-more-frequently.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 850e6f2459fa256a80988009a4fedfb9a52b9aed Mon Sep 17 00:00:00 2001
-Message-ID: <850e6f2459fa256a80988009a4fedfb9a52b9aed.1734700218.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 18 Dec 2024 11:07:26 +0100
-Subject: [PATCH] qemu: Enable I/O APIC even more frequently
-
-In my previous commit v10.10.0-48-g2d222ecf6e I've made us enable
-I/O APIC when there is an IOMMU with EIM. This works well. What
-does not work is case when there's just an IOMMU without EIM but
-with 256+ vCPUS. Problem is that post parsing happens in two
-stages: general domain post parse (where
-qemuDomainDefEnableDefaultFeatures() is called) and then per
-device post parse (where qemuDomainIOMMUDefPostParse() is
-called). Now, in aforementioned case it is the device post parse
-phase where EIM is enabled but the code that would enable
-VIR_DOMAIN_FEATURE_IOAPIC has already run.
-
-To resolve this, make the domain post parse callback "foresee"
-the future enabling of EIM so that it can turn on I/O APIC
-beforehand.
-
-Resolves: https://issues.redhat.com/browse/RHEL-65844
-Fixes: 2d222ecf6e73614a400b830ac56e9aaa1bc55ecc
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 0162f2008e36df489f6f04e4d6002543acfa171d)
-https://issues.redhat.com/browse/RHEL-65844
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_postparse.c                     | 21 +++++++++---
- ...m-autoadd-v2.x86_64-latest.abi-update.args |  1 +
- ...im-autoadd-v2.x86_64-latest.abi-update.xml |  1 +
- .../intel-iommu-eim-autoadd-v2.xml            | 32 +++++++++++++++++++
- tests/qemuxmlconftest.c                       |  1 +
- 5 files changed, 51 insertions(+), 5 deletions(-)
- create mode 120000 tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.args
- create mode 120000 tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.xml
- create mode 100644 tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.xml
-
-diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c
-index f48f172c37..049a6ef2dc 100644
---- a/src/qemu/qemu_postparse.c
-+++ b/src/qemu/qemu_postparse.c
-@@ -783,6 +783,15 @@ qemuDomainPstoreDefPostParse(virDomainPstoreDef *pstore,
- }
- 
- 
-+static bool
-+qemuDomainNeedsIOMMUWithEIM(const virDomainDef *def)
-+{
-+    return ARCH_IS_X86(def->os.arch) &&
-+           virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM &&
-+           qemuDomainIsQ35(def);
-+}
-+
-+
- static int
- qemuDomainIOMMUDefPostParse(virDomainIOMMUDef *iommu,
-                             const virDomainDef *def,
-@@ -793,9 +802,7 @@ qemuDomainIOMMUDefPostParse(virDomainIOMMUDef *iommu,
-      * (EIM) is not explicitly turned off, let's enable it. If we didn't then
-      * guest will have troubles with interrupts. */
-     if (parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE &&
--        ARCH_IS_X86(def->os.arch) &&
--        virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM &&
--        qemuDomainIsQ35(def) &&
-+        qemuDomainNeedsIOMMUWithEIM(def) &&
-         iommu && iommu->model == VIR_DOMAIN_IOMMU_MODEL_INTEL) {
- 
-         /* eim requires intremap. */
-@@ -1548,9 +1555,13 @@ qemuDomainDefEnableDefaultFeatures(virDomainDef *def,
-         def->features[VIR_DOMAIN_FEATURE_GIC] = VIR_TRISTATE_SWITCH_ON;
-     }
- 
--    /* IOMMU with intremap requires split I/O APIC */
-+    /* IOMMU with intremap requires split I/O APIC. But it may happen that
-+     * domain already has IOMMU without inremap. This will be fixed in
-+     * qemuDomainIOMMUDefPostParse() but there domain definition can't be
-+     * modified so change it now. */
-     if (def->iommu &&
--        def->iommu->intremap == VIR_TRISTATE_SWITCH_ON &&
-+        (def->iommu->intremap == VIR_TRISTATE_SWITCH_ON ||
-+         qemuDomainNeedsIOMMUWithEIM(def)) &&
-         def->features[VIR_DOMAIN_FEATURE_IOAPIC] == VIR_DOMAIN_IOAPIC_NONE) {
-         def->features[VIR_DOMAIN_FEATURE_IOAPIC] = VIR_DOMAIN_IOAPIC_QEMU;
-     }
-diff --git a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.args
-new file mode 120000
-index 0000000000..a7fdee3d71
---- /dev/null
-+++ b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.args
-@@ -0,0 +1 @@
-+intel-iommu-eim-autoadd.x86_64-latest.abi-update.args
-\ No newline at end of file
-diff --git a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.xml b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.xml
-new file mode 120000
-index 0000000000..928ea1b4c8
---- /dev/null
-+++ b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.xml
-@@ -0,0 +1 @@
-+intel-iommu-eim-autoadd.x86_64-latest.abi-update.xml
-\ No newline at end of file
-diff --git a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.xml b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.xml
-new file mode 100644
-index 0000000000..b39ee55786
---- /dev/null
-+++ b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.xml
-@@ -0,0 +1,32 @@
-+<domain type='kvm'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219100</memory>
-+  <currentMemory unit='KiB'>219100</currentMemory>
-+  <vcpu placement='static'>288</vcpu>
-+  <os>
-+    <type arch='x86_64' machine='q35'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='forbid'>qemu64</model>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <controller type='pci' index='0' model='pcie-root'/>
-+    <controller type='usb' index='0' model='none'/>
-+    <controller type='sata' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-+    </controller>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <iommu model="intel"/>
-+    <audio id='1' type='none'/>
-+    <watchdog model='itco' action='reset'/>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index f3c8d0ae34..53a0237a42 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -2771,6 +2771,7 @@ mymain(void)
-     DO_TEST_CAPS_LATEST("intel-iommu-dma-translation");
-     DO_TEST_CAPS_LATEST_PARSE_ERROR("intel-iommu-wrong-machine");
-     DO_TEST_CAPS_LATEST_ABI_UPDATE("intel-iommu-eim-autoadd");
-+    DO_TEST_CAPS_LATEST_ABI_UPDATE("intel-iommu-eim-autoadd-v2");
-     DO_TEST_CAPS_ARCH_LATEST("iommu-smmuv3", "aarch64");
-     DO_TEST_CAPS_LATEST("virtio-iommu-x86_64");
-     DO_TEST_CAPS_VER_PARSE_ERROR("virtio-iommu-x86_64", "6.1.0");
--- 
-2.47.1
diff --git a/SOURCES/libvirt-qemu-Enable-I-O-APIC-if-needed.patch b/SOURCES/libvirt-qemu-Enable-I-O-APIC-if-needed.patch
deleted file mode 100644
index aab48fc..0000000
--- a/SOURCES/libvirt-qemu-Enable-I-O-APIC-if-needed.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 29a1c56854c6bcd7b8f91952d3060fb4314a2968 Mon Sep 17 00:00:00 2001
-Message-ID: <29a1c56854c6bcd7b8f91952d3060fb4314a2968.1734433245.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 12 Dec 2024 10:02:43 +0100
-Subject: [PATCH] qemu: Enable I/O APIC if needed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a follow up of my previous commits. If the number of
-vCPUs exceeds some arbitrary value (255) then QEMU requires IOMMU
-with EIM and intremap enabled. But in turn, intremap IOMMU
-requires split I/O APIC (per virDomainDefIOMMUValidate()). Since
-after my previous commits (e.g. v10.10.0-rc1~183) IOMMU is added
-automagically, the I/O APIC can be also enabled automagically.
-
-Relates to: https://issues.redhat.com/browse/RHEL-65844
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 2d222ecf6e73614a400b830ac56e9aaa1bc55ecc)
-https://issues.redhat.com/browse/RHEL-65844
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_postparse.c                         | 7 +++++++
- tests/qemuxmlconfdata/intel-iommu-eim-autoadd.xml | 3 ---
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c
-index 03b5ef825a..f48f172c37 100644
---- a/src/qemu/qemu_postparse.c
-+++ b/src/qemu/qemu_postparse.c
-@@ -1547,6 +1547,13 @@ qemuDomainDefEnableDefaultFeatures(virDomainDef *def,
-          * capabilities, we still want to enable this */
-         def->features[VIR_DOMAIN_FEATURE_GIC] = VIR_TRISTATE_SWITCH_ON;
-     }
-+
-+    /* IOMMU with intremap requires split I/O APIC */
-+    if (def->iommu &&
-+        def->iommu->intremap == VIR_TRISTATE_SWITCH_ON &&
-+        def->features[VIR_DOMAIN_FEATURE_IOAPIC] == VIR_DOMAIN_IOAPIC_NONE) {
-+        def->features[VIR_DOMAIN_FEATURE_IOAPIC] = VIR_DOMAIN_IOAPIC_QEMU;
-+    }
- }
- 
- 
-diff --git a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.xml b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.xml
-index fa3aaf0d44..5abc40e566 100644
---- a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.xml
-+++ b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.xml
-@@ -8,9 +8,6 @@
-     <type arch='x86_64' machine='q35'>hvm</type>
-     <boot dev='hd'/>
-   </os>
--  <features>
--    <ioapic driver='qemu'/>
--  </features>
-   <cpu mode='custom' match='exact' check='none'>
-     <model fallback='forbid'>qemu64</model>
-   </cpu>
--- 
-2.47.1
diff --git a/SOURCES/libvirt-qemu-Extract-disk-setup-done-via-QMP-into-a-separate-helper.patch b/SOURCES/libvirt-qemu-Extract-disk-setup-done-via-QMP-into-a-separate-helper.patch
new file mode 100644
index 0000000..5be3c04
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Extract-disk-setup-done-via-QMP-into-a-separate-helper.patch
@@ -0,0 +1,144 @@
+From 1b76214345d8ffb9f3238a9804b2bef342112018 Mon Sep 17 00:00:00 2001
+Message-ID: <1b76214345d8ffb9f3238a9804b2bef342112018.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 29 Jan 2026 11:15:04 +0100
+Subject: [PATCH] qemu: Extract disk setup done via QMP into a separate helper
+
+Introduce 'qemuProcessSetupDiskPropsRuntime' helper function which will
+collect all code used for runtime setup of a disk.
+
+This is currently old-style throttling.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 1789a0f8a3623e8f0f6e50730feb58e3d8c48376)
+
+https://issues.redhat.com/browse/RHEL-147866 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-131335 [rhel-10.2]
+
+Conflicts:
+ - Commit b9b9092c9c1f8b42e311c524d9fc4a8e73ae28a6 which dropped disk
+   property refresh was not backported, thus the context around the call
+   to qemuProcessSetupDiskPropsRuntime was different
+---
+ src/qemu/qemu_hotplug.c | 23 +++++------------------
+ src/qemu/qemu_process.c | 37 +++++++++++++++++++++++++++----------
+ src/qemu/qemu_process.h |  3 +++
+ 3 files changed, 35 insertions(+), 28 deletions(-)
+
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index fb426deb1a..f2dc4469a3 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -569,13 +569,8 @@ qemuDomainChangeMediaBlockdev(virDomainObj *vm,
+     }
+ 
+     /* set throttling for the new image */
+-    if (rc == 0 &&
+-        !virStorageSourceIsEmpty(newsrc) &&
+-        qemuDiskConfigBlkdeviotuneEnabled(disk)) {
+-        rc = qemuMonitorSetBlockIoThrottle(priv->mon,
+-                                           diskPriv->qomName,
+-                                           &disk->blkdeviotune);
+-    }
++    if (rc == 0)
++        rc = qemuProcessSetupDiskPropsRuntime(priv->mon, disk);
+ 
+     if (rc == 0)
+         rc = qemuMonitorBlockdevTrayClose(priv->mon, diskPriv->qomName);
+@@ -795,21 +790,13 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm,
+     if (rc == 0)
+         rc = qemuMonitorAddDeviceProps(priv->mon, &devprops);
+ 
+-    /* Setup throttling of disk via block_set_io_throttle QMP command. This
+-     * is a hack until the 'throttle' blockdev driver will support modification
+-     * of the trhottle group. See also qemuProcessSetupDiskThrottlingBlockdev.
+-     * As there isn't anything sane to do if this fails, let's just return
+-     * success.
+-     */
+     if (rc == 0) {
+         qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
+         g_autoptr(GHashTable) blockinfo = NULL;
+ 
+-        if (qemuDiskConfigBlkdeviotuneEnabled(disk)) {
+-            if (qemuMonitorSetBlockIoThrottle(priv->mon, diskPriv->qomName,
+-                                              &disk->blkdeviotune) < 0)
+-                VIR_WARN("failed to set blkdeviotune for '%s' of '%s'", disk->dst, vm->def->name);
+-        }
++        /* There isn't anything sane to do if this fails (rollback would
++         * require hot-unplug), let's just return success. */
++        ignore_value(qemuProcessSetupDiskPropsRuntime(priv->mon, disk));
+ 
+         if ((blockinfo = qemuMonitorGetBlockInfo(priv->mon))) {
+             struct qemuDomainDiskInfo *diskinfo;
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index d8f0c78fd1..c99bb36c93 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7937,6 +7937,32 @@ qemuProcessGenID(virDomainObj *vm,
+ }
+ 
+ 
++/**
++ * qemuProcessSetupDiskPropsRuntime:
++ * @mon: qemu monitor object
++ * @disk: disk definition
++ *
++ * This function expects that caller already entered 'monitor' context.
++ *
++ * Sets up disk properties which are only possible to be set in runtime.
++ */
++int
++qemuProcessSetupDiskPropsRuntime(qemuMonitor *mon,
++                                 virDomainDiskDef *disk)
++{
++    if (virStorageSourceIsEmpty(disk->src))
++        return 0;
++
++    if (qemuDiskConfigBlkdeviotuneEnabled(disk) &&
++        qemuMonitorSetBlockIoThrottle(mon,
++                                      QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName,
++                                      &disk->blkdeviotune) < 0)
++        return -1;
++
++    return 0;
++}
++
++
+ /**
+  * qemuProcessSetupDiskThrottling:
+  *
+@@ -7960,16 +7986,7 @@ qemuProcessSetupDiskThrottling(virDomainObj *vm,
+     for (i = 0; i < vm->def->ndisks; i++) {
+         virDomainDiskDef *disk = vm->def->disks[i];
+ 
+-        /* Setting throttling for empty drives fails */
+-        if (virStorageSourceIsEmpty(disk->src))
+-            continue;
+-
+-        if (!qemuDiskConfigBlkdeviotuneEnabled(disk))
+-            continue;
+-
+-        if (qemuMonitorSetBlockIoThrottle(qemuDomainGetMonitor(vm),
+-                                          QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName,
+-                                          &disk->blkdeviotune) < 0)
++        if (qemuProcessSetupDiskPropsRuntime(qemuDomainGetMonitor(vm), disk) < 0)
+             goto cleanup;
+     }
+ 
+diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
+index 426e11d79e..df78b00abb 100644
+--- a/src/qemu/qemu_process.h
++++ b/src/qemu/qemu_process.h
+@@ -146,6 +146,9 @@ int qemuProcessPrepareHostStorageSourceChain(virDomainObj *vm,
+ int qemuProcessPrepareHostStorageDisk(virDomainObj *vm,
+                                   virDomainDiskDef *disk);
+ 
++int qemuProcessSetupDiskPropsRuntime(qemuMonitor *mon,
++                                     virDomainDiskDef *disk);
++
+ int qemuProcessDeleteThreadContext(virDomainObj *vm);
+ 
+ int qemuProcessLaunch(virConnectPtr conn,
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-Fill-iommufd-domain-capability.patch b/SOURCES/libvirt-qemu-Fill-iommufd-domain-capability.patch
new file mode 100644
index 0000000..c1c2a34
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Fill-iommufd-domain-capability.patch
@@ -0,0 +1,1257 @@
+From 3e57f446680a20a8f69c32f0491955f0770a31fe Mon Sep 17 00:00:00 2001
+Message-ID: <3e57f446680a20a8f69c32f0491955f0770a31fe.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Mon, 16 Feb 2026 10:44:57 +0100
+Subject: [PATCH] qemu: Fill iommufd domain capability
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 63434db800b921e96fec424a667b7161af1f02de)
+
+Conflicts:
+  These files don't exist in downstream:
+    tests/domaincapsdata/qemu_10.1.0.s390x.xml
+    tests/domaincapsdata/qemu_10.2.0-virt.aarch64.xml
+    tests/domaincapsdata/qemu_10.2.0.aarch64.xml
+    tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml
+    tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml
+    tests/domaincapsdata/qemu_11.0.0-virt.aarch64.xml
+    tests/domaincapsdata/qemu_11.0.0.aarch64.xml
+    tests/domaincapsdata/qemu_11.0.0.x86_64.xml
+
+Resolves: https://issues.redhat.com/browse/RHEL-138544
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_capabilities.c                  | 21 ++++++++++++++-----
+ .../qemu_10.0.0-q35.x86_64+amdsev.xml         |  4 ++++
+ .../domaincapsdata/qemu_10.0.0-q35.x86_64.xml |  4 ++++
+ .../qemu_10.0.0-tcg.x86_64+amdsev.xml         |  4 ++++
+ .../domaincapsdata/qemu_10.0.0-tcg.x86_64.xml |  4 ++++
+ .../qemu_10.0.0-virt.aarch64.xml              |  4 ++++
+ tests/domaincapsdata/qemu_10.0.0.aarch64.xml  |  4 ++++
+ tests/domaincapsdata/qemu_10.0.0.ppc64.xml    |  3 +++
+ tests/domaincapsdata/qemu_10.0.0.s390x.xml    |  4 ++++
+ .../qemu_10.0.0.x86_64+amdsev.xml             |  4 ++++
+ tests/domaincapsdata/qemu_10.0.0.x86_64.xml   |  4 ++++
+ .../qemu_10.1.0-q35.x86_64+inteltdx.xml       |  4 ++++
+ .../domaincapsdata/qemu_10.1.0-q35.x86_64.xml |  4 ++++
+ .../qemu_10.1.0-tcg.x86_64+inteltdx.xml       |  4 ++++
+ .../domaincapsdata/qemu_10.1.0-tcg.x86_64.xml |  4 ++++
+ .../qemu_10.1.0.x86_64+inteltdx.xml           |  4 ++++
+ tests/domaincapsdata/qemu_10.1.0.x86_64.xml   |  4 ++++
+ .../qemu_10.2.0-q35.x86_64+mshv.xml           |  4 ++++
+ .../domaincapsdata/qemu_10.2.0-q35.x86_64.xml |  4 ++++
+ .../qemu_10.2.0-tcg.x86_64+mshv.xml           |  4 ++++
+ .../domaincapsdata/qemu_10.2.0-tcg.x86_64.xml |  4 ++++
+ .../qemu_10.2.0.x86_64+mshv.xml               |  4 ++++
+ tests/domaincapsdata/qemu_10.2.0.x86_64.xml   |  4 ++++
+ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  |  3 +++
+ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |  3 +++
+ tests/domaincapsdata/qemu_6.2.0.ppc64.xml     |  3 +++
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml    |  3 +++
+ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  |  3 +++
+ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  |  3 +++
+ tests/domaincapsdata/qemu_7.0.0.ppc64.xml     |  3 +++
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml    |  3 +++
+ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  |  3 +++
+ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  |  3 +++
+ tests/domaincapsdata/qemu_7.1.0.ppc64.xml     |  3 +++
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml    |  3 +++
+ .../qemu_7.2.0-hvf.x86_64+hvf.xml             |  3 +++
+ .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml  |  3 +++
+ .../qemu_7.2.0-tcg.x86_64+hvf.xml             |  3 +++
+ .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml  |  3 +++
+ tests/domaincapsdata/qemu_7.2.0.ppc.xml       |  3 +++
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml    |  3 +++
+ .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml  |  3 +++
+ .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml  |  3 +++
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml    |  3 +++
+ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml  |  3 +++
+ .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml  |  3 +++
+ tests/domaincapsdata/qemu_8.1.0.s390x.xml     |  3 +++
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml    |  3 +++
+ .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml  |  3 +++
+ .../qemu_8.2.0-tcg-virt.loongarch64.xml       |  3 +++
+ .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml  |  3 +++
+ .../qemu_8.2.0-virt.aarch64.xml               |  3 +++
+ .../qemu_8.2.0-virt.loongarch64.xml           |  3 +++
+ tests/domaincapsdata/qemu_8.2.0.aarch64.xml   |  3 +++
+ tests/domaincapsdata/qemu_8.2.0.armv7l.xml    |  3 +++
+ tests/domaincapsdata/qemu_8.2.0.s390x.xml     |  3 +++
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml    |  3 +++
+ .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml  |  4 ++++
+ .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml  |  4 ++++
+ tests/domaincapsdata/qemu_9.0.0.sparc.xml     |  3 +++
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml    |  4 ++++
+ .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml  |  4 ++++
+ .../qemu_9.1.0-tcg-virt.riscv64.xml           |  3 +++
+ .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml  |  4 ++++
+ .../qemu_9.1.0-virt.riscv64.xml               |  3 +++
+ tests/domaincapsdata/qemu_9.1.0.s390x.xml     |  4 ++++
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml    |  4 ++++
+ .../qemu_9.2.0-hvf.aarch64+hvf.xml            |  3 +++
+ .../qemu_9.2.0-q35.x86_64+amdsev.xml          |  4 ++++
+ .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml  |  4 ++++
+ .../qemu_9.2.0-tcg.x86_64+amdsev.xml          |  4 ++++
+ .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml  |  4 ++++
+ tests/domaincapsdata/qemu_9.2.0.s390x.xml     |  4 ++++
+ .../qemu_9.2.0.x86_64+amdsev.xml              |  4 ++++
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml    |  4 ++++
+ tests/domaincapsmock.c                        | 17 ++++++++++++++-
+ 76 files changed, 289 insertions(+), 6 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index c23ff5539a..ed6aa86da2 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -45,6 +45,7 @@
+ #include "qemu_firmware.h"
+ #include "virutil.h"
+ #include "virtpm.h"
++#include "viriommufd.h"
+ 
+ #include <fcntl.h>
+ #include <sys/stat.h>
+@@ -6777,6 +6778,7 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCaps *qemuCaps,
+     hostdev->subsysType.report = true;
+     hostdev->capsType.report = true;
+     hostdev->pciBackend.report = true;
++    hostdev->iommufd.report = true;
+ 
+     /* VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES is for containers only */
+     VIR_DOMAIN_CAPS_ENUM_SET(hostdev->mode,
+@@ -6808,11 +6810,20 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCaps *qemuCaps,
+     virDomainCapsEnumClear(&hostdev->capsType);
+ 
+     virDomainCapsEnumClear(&hostdev->pciBackend);
+-    if (supportsPassthroughVFIO &&
+-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) {
+-        VIR_DOMAIN_CAPS_ENUM_SET(hostdev->pciBackend,
+-                                 VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT,
+-                                 VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO);
++
++    VIR_DOMAIN_CAPS_ENUM_SET(hostdev->iommufd, VIR_TRISTATE_BOOL_NO);
++
++    if (supportsPassthroughVFIO) {
++        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) {
++            VIR_DOMAIN_CAPS_ENUM_SET(hostdev->pciBackend,
++                                     VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT,
++                                     VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO);
++        }
++
++        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_IOMMUFD) &&
++            virIOMMUFDSupported()) {
++            VIR_DOMAIN_CAPS_ENUM_SET(hostdev->iommufd, VIR_TRISTATE_BOOL_YES);
++        }
+     }
+ }
+ 
+diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml
+index 8cb51d795c..aeccdf612d 100644
+--- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml
++++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml
+@@ -856,6 +856,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
+index 56192354ac..86a740099b 100644
+--- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
+@@ -1755,6 +1755,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml
+index 4242f2fe9c..5d9ce948f8 100644
+--- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml
++++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml
+@@ -1840,6 +1840,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
+index 76d5fdd0d9..3915ec38cf 100644
+--- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
+@@ -1840,6 +1840,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml
+index 30863d3d6b..058bd84a33 100644
+--- a/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml
++++ b/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml
+@@ -154,6 +154,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.0.0.aarch64.xml b/tests/domaincapsdata/qemu_10.0.0.aarch64.xml
+index 30863d3d6b..058bd84a33 100644
+--- a/tests/domaincapsdata/qemu_10.0.0.aarch64.xml
++++ b/tests/domaincapsdata/qemu_10.0.0.aarch64.xml
+@@ -154,6 +154,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.0.0.ppc64.xml b/tests/domaincapsdata/qemu_10.0.0.ppc64.xml
+index 5136e7a20d..f3ff165aa1 100644
+--- a/tests/domaincapsdata/qemu_10.0.0.ppc64.xml
++++ b/tests/domaincapsdata/qemu_10.0.0.ppc64.xml
+@@ -107,6 +107,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.0.0.s390x.xml b/tests/domaincapsdata/qemu_10.0.0.s390x.xml
+index 3bbdbd68d0..220afb9d7d 100644
+--- a/tests/domaincapsdata/qemu_10.0.0.s390x.xml
++++ b/tests/domaincapsdata/qemu_10.0.0.s390x.xml
+@@ -283,6 +283,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml
+index 8b02db8802..9dcc7f2e44 100644
+--- a/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml
++++ b/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml
+@@ -856,6 +856,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
+index 6dac17808c..c0c3a2e6db 100644
+--- a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
+@@ -1755,6 +1755,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml
+index e3170bf2b3..346a94c1ec 100644
+--- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml
++++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml
+@@ -860,6 +860,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml
+index 6213908152..fc82987630 100644
+--- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml
+@@ -2100,6 +2100,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml
+index 949b85bd25..07fe65d429 100644
+--- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml
++++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml
+@@ -2088,6 +2088,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml
+index 804848b8a7..34e5812613 100644
+--- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml
+@@ -2226,6 +2226,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml
+index 93ce017e97..1d476275a2 100644
+--- a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml
++++ b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml
+@@ -860,6 +860,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml
+index 35c9b8c6d3..3be5e34fe6 100644
+--- a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml
+@@ -2100,6 +2100,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml
+index ebba8fd49f..6914726a8b 100644
+--- a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml
++++ b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml
+@@ -110,6 +110,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml
+index 78e8b774e6..baf8f458db 100644
+--- a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml
+@@ -1072,6 +1072,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml
+index 6c6f1e84c3..35331dc4d4 100644
+--- a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml
++++ b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml
+@@ -2223,6 +2223,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml
+index 14e8e30f1c..7fba7f45f3 100644
+--- a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml
+@@ -2226,6 +2226,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml b/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml
+index c8f2585d7d..faf9b15e0d 100644
+--- a/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml
++++ b/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml
+@@ -110,6 +110,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml
+index 59370259e7..354653d49a 100644
+--- a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml
+@@ -1072,6 +1072,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 b14cbddc59..0b66b77e73 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -1060,6 +1060,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 51547bf505..ce4b14f28c 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1862,6 +1862,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+index 411925ad66..fb8361ae97 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+@@ -108,6 +108,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index ab387c862e..33b2e4905e 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -1060,6 +1060,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 4bbcb516ec..2d7519ae94 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -1089,6 +1089,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 839f0600c2..01975a5e34 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1888,6 +1888,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
+index 147d1bf7fb..03bbe16497 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
+@@ -110,6 +110,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 612b5a44cc..8fa3d3e0f4 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -1089,6 +1089,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 a031b673dd..1991133a62 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -1056,6 +1056,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 9360f8fadf..41bfdbecb6 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1836,6 +1836,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml
+index f3a2dfe6ff..03d6b23a45 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml
+@@ -103,6 +103,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index 6738d8f852..54e8e9d87a 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -1056,6 +1056,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 b338bcc470..58ef1bde99 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
+@@ -1061,6 +1061,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 39eb10dc7a..7c325b52aa 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -1061,6 +1061,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 77fce0eb95..27ecea6fe0 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
+@@ -1541,6 +1541,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 77fce0eb95..27ecea6fe0 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1541,6 +1541,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.ppc.xml b/tests/domaincapsdata/qemu_7.2.0.ppc.xml
+index 8bda6af431..7cbde763ef 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.ppc.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.ppc.xml
+@@ -102,6 +102,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 16708c3d85..b9a174368a 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -1061,6 +1061,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 4acd9b76b2..60893adebf 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -1143,6 +1143,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 c8efc8f183..23e41eb13c 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1636,6 +1636,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index cfa00f3150..daa91d428f 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -1143,6 +1143,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 83a703da52..df003825ea 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1402,6 +1402,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+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 725002966d..10330281bd 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1658,6 +1658,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml
+index 0872931dd7..c86f0113f3 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml
+@@ -371,6 +371,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 6a3cb84342..205334e84b 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1402,6 +1402,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+index a25cf01799..bd9dbf8cba 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1403,6 +1403,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml
+index eead5ff076..10e514dd45 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml
+@@ -106,6 +106,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+index 3b986eb386..60e5cb8632 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1624,6 +1624,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
+index bb563d6e6c..f67204a14c 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
+@@ -154,6 +154,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml
+index 4d441289a4..6e05a09abb 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml
+@@ -110,6 +110,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
+index bb563d6e6c..f67204a14c 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
+@@ -154,6 +154,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml
+index 5c467d4a14..7a537a1abc 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml
+@@ -104,6 +104,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.s390x.xml b/tests/domaincapsdata/qemu_8.2.0.s390x.xml
+index 5126dd4d00..ad80492e30 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.s390x.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.s390x.xml
+@@ -372,6 +372,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 57cd4d63de..c6558915c1 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1403,6 +1403,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+index c7932014ad..930014727d 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1403,6 +1403,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+index 3593d70166..19adcfe249 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1553,6 +1553,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.sparc.xml b/tests/domaincapsdata/qemu_9.0.0.sparc.xml
+index 6b4dd3c3b5..062e55718b 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.sparc.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.sparc.xml
+@@ -90,6 +90,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'/>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 96303a31cd..bc4e7fa1ee 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1403,6 +1403,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+index 518a6811fe..927c1b4fab 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1539,6 +1539,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
+index ce7fe71141..cb519f348c 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
+@@ -117,6 +117,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+index 70928471b3..a8b1bfed73 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1658,6 +1658,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml
+index fabb09bf72..8e9bd3a15b 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml
+@@ -106,6 +106,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsdata/qemu_9.1.0.s390x.xml
+index d4649de513..2854713ca3 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.s390x.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml
+@@ -235,6 +235,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index ee101364cc..e4d36b95ac 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1539,6 +1539,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml b/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml
+index ae657c7f72..db51e7b120 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml
+@@ -151,6 +151,9 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml
+index 35dc5785bc..39bdb2615b 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml
+@@ -736,6 +736,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+index baaaf4f91c..cc31c01dee 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1597,6 +1597,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml
+index 033004a1f4..d01e029394 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml
+@@ -1705,6 +1705,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+index f20fe882c6..6088c4b905 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1705,6 +1705,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.s390x.xml b/tests/domaincapsdata/qemu_9.2.0.s390x.xml
+index 21a1b4f5a9..ef379afe69 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.s390x.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.s390x.xml
+@@ -235,6 +235,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml
+index 39390d2ab6..c0485f8ffa 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml
+@@ -736,6 +736,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index c477a1d2c4..dcb78a93c6 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1597,6 +1597,10 @@
+         <value>default</value>
+         <value>vfio</value>
+       </enum>
++      <enum name='iommufd'>
++        <value>yes</value>
++        <value>no</value>
++      </enum>
+     </hostdev>
+     <rng supported='yes'>
+       <enum name='model'>
+diff --git a/tests/domaincapsmock.c b/tests/domaincapsmock.c
+index 7bece6c8c1..370ce35709 100644
+--- a/tests/domaincapsmock.c
++++ b/tests/domaincapsmock.c
+@@ -16,11 +16,13 @@
+ 
+ #include <config.h>
+ 
++#include "virfile.h"
+ #include "virhostcpu.h"
+ #include "virhostmem.h"
++#include "viriommufd.h"
++#include "virmock.h"
+ 
+ #if WITH_QEMU
+-# include "virmock.h"
+ # include "qemu/qemu_capabilities.h"
+ #endif
+ 
+@@ -78,3 +80,16 @@ virHostMemGetTHPSize(unsigned long long *size)
+     *size = 2048;
+     return 0;
+ }
++
++static bool (*real_virFileExists)(const char *path);
++
++bool
++virFileExists(const char *path)
++{
++    VIR_MOCK_REAL_INIT(virFileExists);
++
++    if (STREQ(path, VIR_IOMMU_DEV_PATH))
++        return true;
++
++    return real_virFileExists(path);
++}
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-Handle-quirks-of-device-field-of-BLOCK_IO_ERROR-event-in-monitor-code.patch b/SOURCES/libvirt-qemu-Handle-quirks-of-device-field-of-BLOCK_IO_ERROR-event-in-monitor-code.patch
deleted file mode 100644
index 567f70a..0000000
--- a/SOURCES/libvirt-qemu-Handle-quirks-of-device-field-of-BLOCK_IO_ERROR-event-in-monitor-code.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 62e633d298639fd7b7e9c12e6b9d095872c8e6a3 Mon Sep 17 00:00:00 2001
-Message-ID: <62e633d298639fd7b7e9c12e6b9d095872c8e6a3.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 27 Jan 2025 13:03:58 +0100
-Subject: [PATCH] qemu: Handle quirks of 'device' field of BLOCK_IO_ERROR event
- in monitor code
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-BLOCK_IO_ERROR's 'device' field is an empty string in case when it isn't
-applicable as it was originally mandatory in the qemu API docs.
-
-Move the logic that convert's empty string back to NULL from
-'qemuProcessHandleIOError()' to 'qemuMonitorJSONHandleIOError()'
-
-This also fixes a hypothetical NULL-dereference if qemu would indeed
-report an IO error without the 'device' field present.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 2f8359f827ce92e0b454eca55640a928367131fd)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/qemu/qemu_monitor_json.c | 9 ++++++++-
- src/qemu/qemu_process.c      | 3 ---
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 1b4288b744..345e9383e3 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -708,8 +708,15 @@ qemuMonitorJSONHandleIOError(qemuMonitor *mon, virJSONValue *data)
-         action = "ignore";
-     }
- 
--    if ((device = virJSONValueObjectGetString(data, "device")) == NULL)
-+    if ((device = virJSONValueObjectGetString(data, "device")) == NULL) {
-         VIR_WARN("missing device in disk io error event");
-+    } else {
-+        /* 'device' was documented as mandatory in the qemu event, but later became
-+         * optional, in which case an empty string is sent by qemu. Convert it back
-+         * to NULL */
-+        if (*device == '\0')
-+            device = NULL;
-+    }
- 
-     nodename = virJSONValueObjectGetString(data, "node-name");
- 
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index c618fbf69c..b4f6d358f3 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -840,9 +840,6 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-     virObjectLock(vm);
-     priv = QEMU_DOMAIN_PRIVATE(vm);
- 
--    if (*diskAlias == '\0')
--        diskAlias = NULL;
--
-     if (diskAlias)
-         disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL);
-     else if (nodename)
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-Ignore-cmp_legacy-CPU-flag.patch b/SOURCES/libvirt-qemu-Ignore-cmp_legacy-CPU-flag.patch
new file mode 100644
index 0000000..edb9adb
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Ignore-cmp_legacy-CPU-flag.patch
@@ -0,0 +1,713 @@
+From c55379ad99a087d70a2bc34e2c32c1f6bf27f9ed Mon Sep 17 00:00:00 2001
+Message-ID: <c55379ad99a087d70a2bc34e2c32c1f6bf27f9ed.1770824869.git.jdenemar@redhat.com>
+From: Jean-Louis Dupond <jean-louis@dupond.be>
+Date: Thu, 5 Feb 2026 14:18:42 +0100
+Subject: [PATCH] qemu: Ignore cmp_legacy CPU flag
+
+Since commit 99a637a8 in qemu 10.0, the way the cmp_legacy flag is
+reported changed. The same way as happend with the 'ht' flag in commit
+c6bd2dd634208, which was fixed in libvirt since commit ba16113c.
+
+This causes migrations from a hypervisor running a qemu version before
+that commit to a hypervisor running qemu after that commit fails
+with the following error:
+guest CPU doesn't match specification: extra features: cmp_legacy
+
+We can just ignore this flag, just like we did with the 'ht' flag.
+
+Signed-off-by: Jean-Louis Dupond <jean-louis@dupond.be>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit fc5840b4980045a05b8973900cdbe36162e48331)
+
+https://issues.redhat.com/browse/RHEL-146629
+
+Conflicts:
+	tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
+	tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
+	tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
+	tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
+            - upstream commit v11.10.0-78-g380764992d
+              (qemucapabilitiesdata: Re-generate 'caps_10.2.0_x86_64')
+              that added rdseed=off to test files is not backported
+
+	tests/qemuxmlconfdata/memory-hotplug-numa-preferred.x86_64-latest.args
+            - missing downstream, it was added upstream after the last
+              rebase
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_capabilities.c                                    | 1 +
+ .../cpu-host-model-fallback-kvm.x86_64-10.0.0.args              | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-10.1.0.args              | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-6.2.0.args               | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-7.0.0.args               | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-7.1.0.args               | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-7.2.0.args               | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-8.0.0.args               | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-8.1.0.args               | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-8.2.0.args               | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-9.0.0.args               | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-9.1.0.args               | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-9.2.0.args               | 2 +-
+ .../cpu-host-model-fallback-kvm.x86_64-latest.args              | 2 +-
+ .../cpu-host-model-fallback-tcg.x86_64-10.1.0.args              | 2 +-
+ .../cpu-host-model-fallback-tcg.x86_64-latest.args              | 2 +-
+ .../qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args  | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args     | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args     | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.2.0.args      | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.0.0.args      | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.1.0.args      | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args      | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args      | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args      | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args      | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args      | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args      | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args      | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args     | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-10.0.0.args            | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-10.1.0.args            | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-6.2.0.args             | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-7.0.0.args             | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-7.1.0.args             | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-7.2.0.args             | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-8.0.0.args             | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-8.1.0.args             | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-8.2.0.args             | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-9.0.0.args             | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-9.1.0.args             | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-9.2.0.args             | 2 +-
+ .../cpu-host-model-nofallback-kvm.x86_64-latest.args            | 2 +-
+ .../cpu-host-model-nofallback-tcg.x86_64-10.1.0.args            | 2 +-
+ .../cpu-host-model-nofallback-tcg.x86_64-latest.args            | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args     | 2 +-
+ tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args     | 2 +-
+ tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args        | 2 +-
+ 48 files changed, 48 insertions(+), 47 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 92b863a826..d738805ee8 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -3772,6 +3772,7 @@ const char *ignoredFeatures[] = {
+     "vmx-ept-uc", "vmx-ept-wb",      /* never supported by QEMU */
+     "vmx-invvpid-single-context",    /* never supported by QEMU */
+     "ht",                            /* ignored by QEMU, set according to topology */
++    "cmp_legacy",                    /* ignored by QEMU, set according to topology */
+ };
+ 
+ bool
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.args
+index edd334dd8b..08f37274b2 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.0.args
+index 57982574eb..e4044a0c64 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-10.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.args
+index 4aa9011fe8..e8a9aceb4a 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.args
+index e944e69cfd..0df6ce9e3d 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.args
+index d9edda2733..b4a91fa921 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,vmcb-clean=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,vmcb-clean=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args
+index 1d1839b7fa..5d69199876 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args
+index 8278629ee7..e7b424819e 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args
+index 3b733a3c5d..58ad565dba 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-8.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0.args
+index 73296c7df0..fa1b674fa5 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-8.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0.args
+index 8f8b74fa56..fc9985f901 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-9.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0.args
+index c2f394bf09..1db86cb31e 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-9.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0.args
+index 35c8d397c4..4dcd9332cb 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-9.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
+index 6afa8a4c2d..e5b0acb87b 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -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 \
+ -accel kvm \
+--cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off \
++-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.0.args
+index 3b93ed510d..0b67c7f158 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-10.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel tcg \
+--cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,cmp-legacy=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
++-cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
+index 01cf90bb67..443de62f69 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -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 \
+ -accel tcg \
+--cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,cmp-legacy=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
++-cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
+index ce60a39acc..52f636fa77 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -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 \
+ -accel kvm \
+--cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off,abm=on,ds=on,invtsc=off \
++-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off,abm=on,ds=on,invtsc=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args
+index a1c034ec51..7dd5723b98 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args
+index ddf940f75c..987baa9b30 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-10.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.2.0.args
+index f65444948e..4402bad82d 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.0.0.args
+index 8f8b1645d5..d6dfadc3b2 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.1.0.args
+index df03bafab3..09e220487d 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,vmcb-clean=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,vmcb-clean=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args
+index 7a796812fa..7e90b309a9 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args
+index d63438e81c..fc02c9a7e0 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args
+index 901f279a02..8360dc02ef 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-8.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args
+index d141aca9f0..b00138933c 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-8.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args
+index 49575ff4d9..3b42130bd2 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-9.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args
+index fd25e4cd23..c451426cdd 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-9.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args
+index 4b69f59064..1da6e508ff 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-9.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
+index 2bf920b9c7..30010edb3b 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off \
++-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.0.0.args
+index edd334dd8b..08f37274b2 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.1.0.args
+index 57982574eb..e4044a0c64 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-10.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.args
+index 4aa9011fe8..e8a9aceb4a 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.args
+index e944e69cfd..0df6ce9e3d 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.args
+index d9edda2733..b4a91fa921 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,vmcb-clean=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,vmcb-clean=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args
+index 1d1839b7fa..5d69199876 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args
+index 8278629ee7..e7b424819e 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args
+index 3b733a3c5d..58ad565dba 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-8.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2.0.args
+index 73296c7df0..fa1b674fa5 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-8.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0.0.args
+index 8f8b74fa56..fc9985f901 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-9.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1.0.args
+index c2f394bf09..1db86cb31e 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-9.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2.0.args
+index 35c8d397c4..4dcd9332cb 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-9.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel kvm \
+--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
++-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
+index 6afa8a4c2d..e5b0acb87b 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -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 \
+ -accel kvm \
+--cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off \
++-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.1.0.args
+index 3b93ed510d..0b67c7f158 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-i440fx-10.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel tcg \
+--cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,cmp-legacy=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
++-cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
+index 01cf90bb67..443de62f69 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -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 \
+ -accel tcg \
+--cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,cmp-legacy=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
++-cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args
+index 4defeceac3..d12cb96786 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine pc-q35-10.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel tcg \
+--cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,cmp-legacy=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
++-cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
+index 479266659a..688a217c3c 100644
+--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+ -machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+ -accel tcg \
+--cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,cmp-legacy=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
++-cpu EPYC,monitor=on,x2apic=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,no-nested-data-bp=on,null-sel-clr-base=on,vme=off,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+diff --git a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args
+index 49e1b590dd..d425866c67 100644
+--- a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args
+@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -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 \
+ -accel tcg \
+--cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,kvm-pv-unhalt=on \
++-cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,kvm-pv-unhalt=on \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-Implement-support-for-associating-iommufd-to-hostdev.patch b/SOURCES/libvirt-qemu-Implement-support-for-associating-iommufd-to-hostdev.patch
new file mode 100644
index 0000000..2fbd9a6
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Implement-support-for-associating-iommufd-to-hostdev.patch
@@ -0,0 +1,190 @@
+From 3a5fc3778cb4ff0f09567f80947e000f74d513b4 Mon Sep 17 00:00:00 2001
+Message-ID: <3a5fc3778cb4ff0f09567f80947e000f74d513b4.1770383236.git.jdenemar@redhat.com>
+From: Nathan Chen <nathanc@nvidia.com>
+Date: Fri, 30 Jan 2026 10:59:12 -0800
+Subject: [PATCH] qemu: Implement support for associating iommufd to hostdev
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Implement a new iommufd attribute under hostdevs' PCI
+subsystem driver that can be used to specify associated
+iommufd object when launching a qemu VM.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Nathan Chen <nathanc@nvidia.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit fd113055bb174c7284081731d16959f73796e3d7)
+
+Resolves: https://issues.redhat.com/browse/RHEL-126345
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ docs/formatdomain.rst           |  6 +++++
+ src/conf/device_conf.c          | 11 ++++++++
+ src/conf/device_conf.h          |  1 +
+ src/conf/schemas/basictypes.rng |  5 ++++
+ src/qemu/qemu_command.c         | 46 +++++++++++++++++++++++++++++++++
+ 5 files changed, 69 insertions(+)
+
+diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
+index 1467fc7e10..167912348e 100644
+--- a/docs/formatdomain.rst
++++ b/docs/formatdomain.rst
+@@ -4907,6 +4907,12 @@ or:
+    found is "problematic" in some way, the generic vfio-pci driver
+    similarly be forced.
+ 
++   :since:`Since 12.1.0 (QEMU and KVM only)`, the ``iommufd`` element
++   can be used to enable IOMMUFD backend for VFIO device. This
++   provides an interface to propagate DMA mappings to kernel for
++   assigned devices. Libvirt will open the /dev/iommu and VFIO device
++   cdev and pass associated file descriptors to QEMU.
++
+    (Note: :since:`Since 1.0.5`, the ``name`` attribute has been
+    described to be used to select the type of PCI device assignment
+    ("vfio", "kvm", or "xen"), but those values have been mostly
+diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
+index c278b81652..d68232a4f4 100644
+--- a/src/conf/device_conf.c
++++ b/src/conf/device_conf.c
+@@ -67,6 +67,11 @@ virDeviceHostdevPCIDriverInfoParseXML(xmlNodePtr node,
+         return -1;
+     }
+ 
++    if (virXMLPropTristateBool(node, "iommufd",
++                               VIR_XML_PROP_NONE,
++                               &driver->iommufd) < 0)
++        return -1;
++
+     driver->model = virXMLPropString(node, "model");
+     return 0;
+ }
+@@ -93,6 +98,12 @@ virDeviceHostdevPCIDriverInfoFormat(virBuffer *buf,
+ 
+     virBufferEscapeString(&driverAttrBuf, " model='%s'", driver->model);
+ 
++    if (driver->iommufd == VIR_TRISTATE_BOOL_YES) {
++        virBufferAddLit(&driverAttrBuf, " iommufd='yes'");
++    } else if (driver->iommufd == VIR_TRISTATE_BOOL_NO) {
++        virBufferAddLit(&driverAttrBuf, " iommufd='no'");
++    }
++
+     virXMLFormatElement(buf, "driver", &driverAttrBuf, NULL);
+     return 0;
+ }
+diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
+index e570f51824..116b959143 100644
+--- a/src/conf/device_conf.h
++++ b/src/conf/device_conf.h
+@@ -47,6 +47,7 @@ VIR_ENUM_DECL(virDeviceHostdevPCIDriverName);
+ struct _virDeviceHostdevPCIDriverInfo {
+     virDeviceHostdevPCIDriverName name;
+     char *model;
++    virTristateBool iommufd;
+ };
+ 
+ typedef enum {
+diff --git a/src/conf/schemas/basictypes.rng b/src/conf/schemas/basictypes.rng
+index 5689170fad..381e0ac24f 100644
+--- a/src/conf/schemas/basictypes.rng
++++ b/src/conf/schemas/basictypes.rng
+@@ -673,6 +673,11 @@
+           <ref name="genericName"/>
+         </attribute>
+       </optional>
++      <optional>
++        <attribute name="iommufd">
++          <ref name="virYesNo"/>
++        </attribute>
++      </optional>
+       <empty/>
+     </element>
+   </define>
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index b69fe23236..96cd6edbfc 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -4754,6 +4754,7 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
+     g_autofree char *host = virPCIDeviceAddressAsString(&pcisrc->addr);
+     const char *failover_pair_id = NULL;
+     const char *driver = NULL;
++    const char *iommufdId = NULL;
+     /* 'ramfb' property must be omitted unless it's to be enabled */
+     bool ramfb = pcisrc->ramfb == VIR_TRISTATE_SWITCH_ON;
+ 
+@@ -4787,6 +4788,9 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
+         teaming->persistent)
+         failover_pair_id = teaming->persistent;
+ 
++    if (pcisrc->driver.iommufd == VIR_TRISTATE_BOOL_YES)
++        iommufdId = "iommufd0";
++
+     if (virJSONValueObjectAdd(&props,
+                               "s:driver", driver,
+                               "s:host", host,
+@@ -4795,6 +4799,7 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
+                               "S:failover_pair_id", failover_pair_id,
+                               "S:display", qemuOnOffAuto(pcisrc->display),
+                               "B:ramfb", ramfb,
++                              "S:iommufd", iommufdId,
+                               NULL) < 0)
+         return NULL;
+ 
+@@ -5314,6 +5319,44 @@ qemuBuildHostdevCommandLine(virCommand *cmd,
+ }
+ 
+ 
++static int
++qemuBuildIOMMUFDCommandLine(virCommand *cmd,
++                            const virDomainDef *def)
++{
++    size_t i;
++
++    for (i = 0; i < def->nhostdevs; i++) {
++        virDomainHostdevDef *hostdev = def->hostdevs[i];
++        virDomainHostdevSubsys *subsys = &hostdev->source.subsys;
++        g_autoptr(virJSONValue) props = NULL;
++
++        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
++            continue;
++
++        if (subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
++            continue;
++
++        if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED)
++            continue;
++
++        if (subsys->u.pci.driver.iommufd != VIR_TRISTATE_BOOL_YES)
++            continue;
++
++        if (qemuMonitorCreateObjectProps(&props, "iommufd",
++                                         "iommufd0",
++                                         NULL) < 0)
++            return -1;
++
++        if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0)
++            return -1;
++
++        break;
++    }
++
++    return 0;
++}
++
++
+ static int
+ qemuBuildMonitorCommandLine(virCommand *cmd,
+                             qemuDomainObjPrivate *priv)
+@@ -10926,6 +10969,9 @@ qemuBuildCommandLine(virDomainObj *vm,
+     if (qemuBuildRedirdevCommandLine(cmd, def, qemuCaps) < 0)
+         return NULL;
+ 
++    if (qemuBuildIOMMUFDCommandLine(cmd, def) < 0)
++        return NULL;
++
+     if (qemuBuildHostdevCommandLine(cmd, def, qemuCaps) < 0)
+         return NULL;
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemu-Implement-support-for-persistent-reservation-migration-control.patch b/SOURCES/libvirt-qemu-Implement-support-for-persistent-reservation-migration-control.patch
new file mode 100644
index 0000000..dc66f88
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Implement-support-for-persistent-reservation-migration-control.patch
@@ -0,0 +1,220 @@
+From f283dd92c79286f822eaddea072cc6a54231dbbc Mon Sep 17 00:00:00 2001
+Message-ID: <f283dd92c79286f822eaddea072cc6a54231dbbc.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 11 Dec 2025 19:47:16 +0100
+Subject: [PATCH] qemu: Implement support for persistent reservation migration
+ control
+
+The 'migration' attribute for the '<reservations>' element allows to
+control the persistent reservation migration feature independently of
+the machine type default.
+
+Add the XML plumbing and qemu support.
+
+We consider it ABI for now since it influences qemu migration protocol.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 0d3ef7cb71979172de2c531d865e4525a314f902)
+
+https://issues.redhat.com/browse/RHEL-140614 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-135115 [rhel-10.2]
+---
+ docs/formatdomain.rst                         |  3 +++
+ src/conf/domain_conf.c                        | 21 +++++++++++++++++++
+ src/conf/schemas/storagecommon.rng            |  5 +++++
+ src/conf/storage_source_conf.c                | 10 +++++++++
+ src/conf/storage_source_conf.h                |  2 ++
+ src/qemu/qemu_command.c                       |  4 ++++
+ src/qemu/qemu_validate.c                      | 16 ++++++++++++++
+ ...irtio-scsi-reservations.x86_64-latest.args |  2 +-
+ .../disk-virtio-scsi-reservations.xml         |  2 +-
+ 9 files changed, 63 insertions(+), 2 deletions(-)
+
+diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
+index 167912348e..9836837441 100644
+--- a/docs/formatdomain.rst
++++ b/docs/formatdomain.rst
+@@ -3169,6 +3169,9 @@ paravirtualized driver is specified via the ``disk`` element.
+       the socket, and finally ``mode`` which accepts one value ``client``
+       specifying the role of hypervisor. It's recommended to allow libvirt
+       manage the persistent reservations.
++      :since:`Since 12.1.0` the ``migration`` (values ``yes``, ``no``) controls
++      whether the hypervisor should attempt to migrate persistent reservations
++      during migration.
+    ``initiator``
+       :since:`Since 4.7.0`, the ``initiator`` element is supported for
+       a disk ``type`` "network" that is using a ``source`` element with the
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 902c1188ef..f5c4d135a9 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -20951,6 +20951,27 @@ virDomainDiskDefCheckABIStability(virDomainDiskDef *src,
+         return false;
+     }
+ 
++    /* While not guest visible it influences the qemu migration stream so
++     * we need to keep it identical */
++    if (src->src->pr || dst->src->pr) {
++        virTristateBool srcmig = VIR_TRISTATE_BOOL_ABSENT;
++        virTristateBool dstmig = VIR_TRISTATE_BOOL_ABSENT;
++
++        if (src->src->pr)
++            srcmig = src->src->pr->migration;
++
++        if (dst->src->pr)
++            dstmig = dst->src->pr->migration;
++
++        if (srcmig != dstmig) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                           _("Target disk reservations 'migration' property %1$s does not match source %2$s"),
++                           virTristateBoolTypeToString(dstmig),
++                           virTristateBoolTypeToString(srcmig));
++            return false;
++        }
++    }
++
+     if (!virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio))
+         return false;
+ 
+diff --git a/src/conf/schemas/storagecommon.rng b/src/conf/schemas/storagecommon.rng
+index 14704c737e..450d53131f 100644
+--- a/src/conf/schemas/storagecommon.rng
++++ b/src/conf/schemas/storagecommon.rng
+@@ -104,6 +104,11 @@
+           <ref name="virYesNo"/>
+         </attribute>
+       </optional>
++      <optional>
++        <attribute name="migration">
++          <ref name="virYesNo"/>
++        </attribute>
++      </optional>
+       <optional>
+         <ref name="unixSocketSource"/>
+       </optional>
+diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c
+index 087de1eaf2..24d4b0de6a 100644
+--- a/src/conf/storage_source_conf.c
++++ b/src/conf/storage_source_conf.c
+@@ -330,6 +330,11 @@ virStoragePRDefParseXML(xmlXPathContextPtr ctxt)
+                                &prd->managed) < 0)
+         goto cleanup;
+ 
++    if (virXMLPropTristateBool(ctxt->node, "migration",
++                               VIR_XML_PROP_NONZERO,
++                               &prd->migration) < 0)
++        goto cleanup;
++
+     type = virXPathString("string(./source[1]/@type)", ctxt);
+     path = virXPathString("string(./source[1]/@path)", ctxt);
+     mode = virXPathString("string(./source[1]/@mode)", ctxt);
+@@ -384,6 +389,11 @@ virStoragePRDefFormat(virBuffer *buf,
+ {
+     virBufferAsprintf(buf, "<reservations managed='%s'",
+                       virTristateBoolTypeToString(prd->managed));
++
++    if (prd->migration != VIR_TRISTATE_BOOL_ABSENT)
++        virBufferAsprintf(buf, " migration='%s'",
++                          virTristateBoolTypeToString(prd->migration));
++
+     if (prd->path &&
+         (prd->managed == VIR_TRISTATE_BOOL_NO || !migratable)) {
+         virBufferAddLit(buf, ">\n");
+diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h
+index fc868b31af..5a4b088eeb 100644
+--- a/src/conf/storage_source_conf.h
++++ b/src/conf/storage_source_conf.h
+@@ -235,6 +235,8 @@ struct _virStoragePRDef {
+     virTristateBool managed;
+     char *path;
+ 
++    virTristateBool migration;
++
+     /* manager object alias */
+     char *mgralias;
+ };
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 807529f670..1718097b63 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -1691,6 +1691,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def,
+     g_autofree char *usbdiskalias = NULL;
+     const virDomainDeviceInfo *deviceinfo = &disk->info;
+     g_autoptr(virJSONValue) statistics = NULL;
++    virTristateBool migrate_pr = VIR_TRISTATE_BOOL_ABSENT;
+     virDomainDeviceInfo usbSCSIinfo = {
+         .type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE,
+         .addr.drive = { .diskbus = VIR_DOMAIN_DISK_BUS_USB },
+@@ -1716,6 +1717,8 @@ qemuBuildDiskDeviceProps(const virDomainDef *def,
+     case VIR_DOMAIN_DISK_BUS_SCSI:
+         if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
+             driver = "scsi-block";
++            if (disk->src->pr)
++                migrate_pr = disk->src->pr->migration;
+         } else {
+             if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
+                 driver = "scsi-cd";
+@@ -1937,6 +1940,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def,
+                               "S:rerror", rpolicy,
+                               "A:stats-intervals", &statistics,
+                               "T:dpofua", disk->dpofua, /* SCSI-only, ensured by validation */
++                              "T:migrate-pr", migrate_pr, /* 'scsi-block' only, ensured by validation */
+                               NULL) < 0)
+         return NULL;
+ 
+diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
+index 66c59c3696..9ab285f768 100644
+--- a/src/qemu/qemu_validate.c
++++ b/src/qemu/qemu_validate.c
+@@ -3224,6 +3224,22 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk,
+         }
+     }
+ 
++    if (disk->src->pr &&
++        disk->src->pr->migration != VIR_TRISTATE_BOOL_ABSENT) {
++        if (disk->device != VIR_DOMAIN_DISK_DEVICE_LUN ||
++            disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("persistent reservation migration supported only with 'lun' disks on 'scsi' bus"));
++            return -1;
++        }
++
++        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("persistent reservation migration not supported by this qemu"));
++            return -1;
++        }
++    }
++
+     if (disk->rotation_rate) {
+         if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI &&
+             disk->bus != VIR_DOMAIN_DISK_BUS_IDE &&
+diff --git a/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args
+index cbc2a0f398..f1d7a450ee 100644
+--- a/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args
+@@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":0,"drive":"libvirt-2-storage","id":"scsi0-0-0-0","bootindex":1}' \
+ -object '{"qom-type":"pr-manager-helper","id":"pr-helper-libvirt-1-storage","path":"/path/to/qemu-pr-helper.sock"}' \
+ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","pr-manager":"pr-helper-libvirt-1-storage","node-name":"libvirt-1-storage","read-only":false}' \
+--device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":1,"drive":"libvirt-1-storage","id":"scsi0-0-0-1"}' \
++-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":1,"drive":"libvirt-1-storage","id":"scsi0-0-0-1","migrate-pr":true}' \
+ -audiodev '{"id":"audio1","driver":"none"}' \
+ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \
+ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+diff --git a/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.xml b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.xml
+index 9c55d6ec3e..7f9160ff3a 100644
+--- a/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.xml
++++ b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.xml
+@@ -28,7 +28,7 @@
+     <disk type='block' device='lun'>
+       <driver name='qemu' type='raw'/>
+       <source dev='/dev/HostVG/QEMUGuest2'>
+-        <reservations managed='no'>
++        <reservations managed='no' migration='yes'>
+           <source type='unix' path='/path/to/qemu-pr-helper.sock' mode='client'/>
+         </reservations>
+       </source>
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-Introduce-QEMU_CAPS_OBJECT_IOMMUFD.patch b/SOURCES/libvirt-qemu-Introduce-QEMU_CAPS_OBJECT_IOMMUFD.patch
new file mode 100644
index 0000000..328aab0
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Introduce-QEMU_CAPS_OBJECT_IOMMUFD.patch
@@ -0,0 +1,266 @@
+From 634e8902ffca6246e5066816d52063f3c82dddb7 Mon Sep 17 00:00:00 2001
+Message-ID: <634e8902ffca6246e5066816d52063f3c82dddb7.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Mon, 16 Feb 2026 08:59:39 +0100
+Subject: [PATCH] qemu: Introduce QEMU_CAPS_OBJECT_IOMMUFD
+
+Detect if QEMU was compiled with IOMMUFD.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 4a0ea9bcf13ea05c90f294ba70c767bc79e2ebbe)
+
+Conflicts:
+  These files don't exist in downstream:
+    tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml
+    tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml
+    tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml
+    tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_capabilities.c                              | 4 ++++
+ src/qemu/qemu_capabilities.h                              | 3 +++
+ src/qemu/qemu_validate.c                                  | 8 ++++++++
+ tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml        | 1 +
+ tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml          | 1 +
+ tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml  | 1 +
+ tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml         | 1 +
+ .../qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml  | 1 +
+ tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml         | 1 +
+ tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml    | 1 +
+ tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml         | 1 +
+ tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml          | 1 +
+ tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml           | 1 +
+ tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml          | 1 +
+ tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml           | 1 +
+ tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml   | 1 +
+ tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml          | 1 +
+ 17 files changed, 29 insertions(+)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 2c8bd62c99..c23ff5539a 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -756,6 +756,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               "query-accelerators", /* QEMU_CAPS_QUERY_ACCELERATORS */
+               "mshv", /* QEMU_CAPS_MSHV */
+               "scsi-block.migrate-pr", /* QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR */
++
++              /* 490 */
++              "iommufd", /* QEMU_CAPS_OBJECT_IOMMUFD */
+     );
+ 
+ 
+@@ -1463,6 +1466,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
+     { "tpm-emulator", QEMU_CAPS_DEVICE_TPM_EMULATOR },
+     { "tpm-passthrough", QEMU_CAPS_DEVICE_TPM_PASSTHROUGH },
+     { "acpi-generic-initiator", QEMU_CAPS_ACPI_GENERIC_INITIATOR },
++    { "iommufd", QEMU_CAPS_OBJECT_IOMMUFD },
+ };
+ 
+ 
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 0c76f2edda..f7c8680f94 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -732,6 +732,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     QEMU_CAPS_MSHV, /* -accel mshv */
+     QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR, /* persistent reservation migration support */
+ 
++    /* 490 */
++    QEMU_CAPS_OBJECT_IOMMUFD, /* -object iommufd */
++
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+ 
+diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
+index 9ab285f768..9886ddaf1d 100644
+--- a/src/qemu/qemu_validate.c
++++ b/src/qemu/qemu_validate.c
+@@ -2720,6 +2720,14 @@ qemuValidateDomainDeviceDefHostdev(const virDomainHostdevDef *hostdev,
+                                    _("VFIO PCI device assignment is not supported by this version of qemu"));
+                     return -1;
+                 }
++
++                if (hostdev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES) {
++                    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_IOMMUFD)) {
++                        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                                       _("IOMMUFD is not supported by this version of qemu"));
++                        return -1;
++                    }
++                }
+             }
+ 
+             if (hostdev->writeFiltering != VIR_TRISTATE_BOOL_ABSENT) {
+diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml
+index 90e8d868cc..bbb8b33cde 100644
+--- a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml
++++ b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml
+@@ -163,6 +163,7 @@
+   <flag name='nvme-ns'/>
+   <flag name='usb-bot'/>
+   <flag name='acpi-generic-initiator'/>
++  <flag name='iommufd'/>
+   <version>10000000</version>
+   <microcodeVersion>61700285</microcodeVersion>
+   <package>v10.0.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
+index 82a66a6524..cf00ac4ea0 100644
+--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
+@@ -136,6 +136,7 @@
+   <flag name='nvme'/>
+   <flag name='nvme-ns'/>
+   <flag name='usb-bot'/>
++  <flag name='iommufd'/>
+   <version>10000000</version>
+   <microcodeVersion>39100285</microcodeVersion>
+   <package>v10.0.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
+index cfce1c963d..5acd1a33fd 100644
+--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
++++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
+@@ -209,6 +209,7 @@
+   <flag name='amd-iommu'/>
+   <flag name='usb-bot'/>
+   <flag name='acpi-generic-initiator'/>
++  <flag name='iommufd'/>
+   <version>10000000</version>
+   <microcodeVersion>43100285</microcodeVersion>
+   <package>v10.0.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
+index f94c8388d6..50f58791e6 100644
+--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
+@@ -209,6 +209,7 @@
+   <flag name='amd-iommu.pci-id'/>
+   <flag name='usb-bot'/>
+   <flag name='acpi-generic-initiator'/>
++  <flag name='iommufd'/>
+   <version>10000000</version>
+   <microcodeVersion>43100285</microcodeVersion>
+   <package>v10.0.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml
+index 8e989a139f..e321c352a3 100644
+--- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml
++++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml
+@@ -191,6 +191,7 @@
+   <flag name='usb-bot'/>
+   <flag name='tdx-guest'/>
+   <flag name='acpi-generic-initiator'/>
++  <flag name='iommufd'/>
+   <version>10000050</version>
+   <microcodeVersion>43100286</microcodeVersion>
+   <package>v10.0.0-1724-gf9a3def17b</package>
+diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml
+index 520a3d8ee8..2d52659520 100644
+--- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml
+@@ -214,6 +214,7 @@
+   <flag name='tdx-guest'/>
+   <flag name='qom-list-get'/>
+   <flag name='acpi-generic-initiator'/>
++  <flag name='iommufd'/>
+   <version>10001000</version>
+   <microcodeVersion>43100286</microcodeVersion>
+   <package>v10.1.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml
+index 874fd7bddb..eb2ab001a6 100644
+--- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml
++++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml
+@@ -201,6 +201,7 @@
+   <flag name='acpi-generic-initiator'/>
+   <flag name='query-accelerators'/>
+   <flag name='mshv'/>
++  <flag name='iommufd'/>
+   <version>10001050</version>
+   <microcodeVersion>43100287</microcodeVersion>
+   <package>v10.1.0-1778-ge090e0312d</package>
+diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
+index 7d5a75ce88..c4ea924c1f 100644
+--- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
+@@ -216,6 +216,7 @@
+   <flag name='disk-timed-stats'/>
+   <flag name='query-accelerators'/>
+   <flag name='scsi-block.migrate-pr'/>
++  <flag name='iommufd'/>
+   <version>10001091</version>
+   <microcodeVersion>43100287</microcodeVersion>
+   <package>v10.2.0-rc1-38-gfb241d0a1f</package>
+diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+index 1f2e27a218..88bd502fee 100644
+--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+@@ -204,6 +204,7 @@
+   <flag name='amd-iommu'/>
+   <flag name='usb-bot'/>
+   <flag name='acpi-generic-initiator'/>
++  <flag name='iommufd'/>
+   <version>9000000</version>
+   <microcodeVersion>43100245</microcodeVersion>
+   <package>v9.0.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
+index b961f79808..3d2692b02c 100644
+--- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
+@@ -126,6 +126,7 @@
+   <flag name='nvme'/>
+   <flag name='nvme-ns'/>
+   <flag name='usb-bot'/>
++  <flag name='iommufd'/>
+   <version>9001000</version>
+   <microcodeVersion>39100246</microcodeVersion>
+   <package>v9.1.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
+index 35ddf30736..66578099a7 100644
+--- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
+@@ -203,6 +203,7 @@
+   <flag name='amd-iommu'/>
+   <flag name='usb-bot'/>
+   <flag name='acpi-generic-initiator'/>
++  <flag name='iommufd'/>
+   <version>9001000</version>
+   <microcodeVersion>43100246</microcodeVersion>
+   <package>v9.1.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
+index e9f79261f7..9f95ed891e 100644
+--- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
+@@ -129,6 +129,7 @@
+   <flag name='nvme'/>
+   <flag name='nvme-ns'/>
+   <flag name='usb-bot'/>
++  <flag name='iommufd'/>
+   <version>9002000</version>
+   <microcodeVersion>39100247</microcodeVersion>
+   <package>v9.2.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
+index 0e52c3e23d..6636346bc5 100644
+--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
++++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
+@@ -207,6 +207,7 @@
+   <flag name='amd-iommu'/>
+   <flag name='usb-bot'/>
+   <flag name='acpi-generic-initiator'/>
++  <flag name='iommufd'/>
+   <version>9002000</version>
+   <microcodeVersion>43100247</microcodeVersion>
+   <package>v9.2.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
+index 95f8a4d878..dee30415aa 100644
+--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
+@@ -205,6 +205,7 @@
+   <flag name='amd-iommu'/>
+   <flag name='usb-bot'/>
+   <flag name='acpi-generic-initiator'/>
++  <flag name='iommufd'/>
+   <version>9002000</version>
+   <microcodeVersion>43100247</microcodeVersion>
+   <package>v9.2.0</package>
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-Introduce-privateData-for-hostdevs.patch b/SOURCES/libvirt-qemu-Introduce-privateData-for-hostdevs.patch
new file mode 100644
index 0000000..13272d3
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Introduce-privateData-for-hostdevs.patch
@@ -0,0 +1,276 @@
+From 7478247b414df910fc319aa3c1d016f81e510fd9 Mon Sep 17 00:00:00 2001
+Message-ID: <7478247b414df910fc319aa3c1d016f81e510fd9.1770383236.git.jdenemar@redhat.com>
+From: Nathan Chen <nathanc@nvidia.com>
+Date: Fri, 30 Jan 2026 10:59:13 -0800
+Subject: [PATCH] qemu: Introduce privateData for hostdevs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduce private data for hostdevs and allocate hostdev
+private data by default.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Nathan Chen <nathanc@nvidia.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 1043e04e17ed4be59b46e925089204333c08f05e)
+
+Resolves: https://issues.redhat.com/browse/RHEL-126345
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/bhyve/bhyve_parse_command.c |  2 +-
+ src/conf/domain_conf.c          | 13 +++++++++--
+ src/conf/domain_conf.h          |  5 ++++-
+ src/libxl/xen_common.c          |  2 +-
+ src/libxl/xen_xl.c              |  2 +-
+ src/lxc/lxc_native.c            |  2 +-
+ src/qemu/qemu_domain.c          | 40 +++++++++++++++++++++++++++++++++
+ src/qemu/qemu_domain.h          | 15 +++++++++++++
+ src/vbox/vbox_common.c          |  2 +-
+ tests/virhostdevtest.c          |  2 +-
+ 10 files changed, 76 insertions(+), 9 deletions(-)
+
+diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c
+index d62ea64beb..8b405206bd 100644
+--- a/src/bhyve/bhyve_parse_command.c
++++ b/src/bhyve/bhyve_parse_command.c
+@@ -687,7 +687,7 @@ bhyveParsePassthru(virDomainDef *def G_GNUC_UNUSED,
+         return -1;
+     }
+ 
+-    hostdev = virDomainHostdevDefNew();
++    hostdev = virDomainHostdevDefNew(NULL);
+     hostdev->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS;
+     hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
+ 
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 541dad5bdc..f950f7c75d 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -2733,6 +2733,8 @@ virDomainHostdevDefClear(virDomainHostdevDef *def)
+     case VIR_DOMAIN_HOSTDEV_MODE_LAST:
+         break;
+     }
++
++    g_clear_pointer(&def->privateData, virObjectUnref);
+ }
+ 
+ 
+@@ -3483,7 +3485,7 @@ void virDomainVideoDefFree(virDomainVideoDef *def)
+ 
+ 
+ virDomainHostdevDef *
+-virDomainHostdevDefNew(void)
++virDomainHostdevDefNew(virDomainXMLOption *xmlopt)
+ {
+     virDomainHostdevDef *def;
+ 
+@@ -3491,6 +3493,13 @@ virDomainHostdevDefNew(void)
+ 
+     def->info = g_new0(virDomainDeviceInfo, 1);
+ 
++    if (xmlopt && xmlopt->privateData.hostdevNew &&
++        !(def->privateData = xmlopt->privateData.hostdevNew())) {
++        VIR_FREE(def->info);
++        VIR_FREE(def);
++        return NULL;
++    }
++
+     return def;
+ }
+ 
+@@ -13678,7 +13687,7 @@ virDomainHostdevDefParseXML(virDomainXMLOption *xmlopt,
+ 
+     ctxt->node = node;
+ 
+-    def = virDomainHostdevDefNew();
++    def = virDomainHostdevDefNew(xmlopt);
+ 
+     if (virXMLPropEnumDefault(node, "mode", virDomainHostdevModeTypeFromString,
+                               VIR_XML_PROP_NONE,
+diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
+index cb35ff06bd..8f53ed96c0 100644
+--- a/src/conf/domain_conf.h
++++ b/src/conf/domain_conf.h
+@@ -364,6 +364,8 @@ struct _virDomainHostdevDef {
+      */
+     virDomainNetDef *parentnet;
+ 
++    virObject *privateData;
++
+     virDomainHostdevMode mode;
+     virDomainStartupPolicy startupPolicy;
+     bool managed;
+@@ -3588,6 +3590,7 @@ struct _virDomainXMLPrivateDataCallbacks {
+     virDomainXMLPrivateDataNewFunc    vsockNew;
+     virDomainXMLPrivateDataNewFunc    cryptoNew;
+     virDomainXMLPrivateDataNewFunc    graphicsNew;
++    virDomainXMLPrivateDataNewFunc    hostdevNew;
+     virDomainXMLPrivateDataNewFunc    networkNew;
+     virDomainXMLPrivateDataNetParseFunc networkParse;
+     virDomainXMLPrivateDataNetFormatFunc networkFormat;
+@@ -3797,7 +3800,7 @@ virDomainVideoDef *virDomainVideoDefNew(virDomainXMLOption *xmlopt);
+ void virDomainVideoDefFree(virDomainVideoDef *def);
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainVideoDef, virDomainVideoDefFree);
+ void virDomainVideoDefClear(virDomainVideoDef *def);
+-virDomainHostdevDef *virDomainHostdevDefNew(void);
++virDomainHostdevDef *virDomainHostdevDefNew(virDomainXMLOption *xmlopt);
+ void virDomainHostdevDefFree(virDomainHostdevDef *def);
+ void virDomainHubDefFree(virDomainHubDef *def);
+ void virDomainRedirdevDefFree(virDomainRedirdevDef *def);
+diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c
+index 666c6cae20..f19e4f6abb 100644
+--- a/src/libxl/xen_common.c
++++ b/src/libxl/xen_common.c
+@@ -445,7 +445,7 @@ xenParsePCI(char *entry)
+         }
+     }
+ 
+-    hostdev = virDomainHostdevDefNew();
++    hostdev = virDomainHostdevDefNew(NULL);
+     hostdev->managed = false;
+     hostdev->writeFiltering = filtered;
+     hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
+diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
+index b2ff0edcf2..e62302736b 100644
+--- a/src/libxl/xen_xl.c
++++ b/src/libxl/xen_xl.c
+@@ -930,7 +930,7 @@ xenParseXLUSB(virConf *conf, virDomainDef *def)
+                 key = nextkey;
+             }
+ 
+-            hostdev = virDomainHostdevDefNew();
++            hostdev = virDomainHostdevDefNew(NULL);
+             hostdev->managed = false;
+             hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB;
+             hostdev->source.subsys.u.usb.bus = busNum;
+diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
+index 7700804429..a94427b027 100644
+--- a/src/lxc/lxc_native.c
++++ b/src/lxc/lxc_native.c
+@@ -376,7 +376,7 @@ lxcCreateNetDef(const char *type,
+ static virDomainHostdevDef *
+ lxcCreateHostdevDef(const char *data)
+ {
+-    virDomainHostdevDef *hostdev = virDomainHostdevDefNew();
++    virDomainHostdevDef *hostdev = virDomainHostdevDefNew(NULL);
+     hostdev->mode = VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES;
+     hostdev->source.caps.type = VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET;
+     hostdev->source.caps.u.net.ifname = g_strdup(data);
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 486a0e7913..3366214677 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1238,6 +1238,45 @@ qemuDomainNetworkPrivateFormat(const virDomainNetDef *net,
+ }
+ 
+ 
++static virClass *qemuDomainHostdevPrivateClass;
++
++static void
++qemuDomainHostdevPrivateDispose(void *obj)
++{
++    qemuDomainHostdevPrivate *priv = obj;
++
++    VIR_FORCE_CLOSE(priv->vfioDeviceFd);
++}
++
++
++static int
++qemuDomainHostdevPrivateOnceInit(void)
++{
++    if (!VIR_CLASS_NEW(qemuDomainHostdevPrivate, virClassForObject()))
++        return -1;
++
++    return 0;
++}
++
++VIR_ONCE_GLOBAL_INIT(qemuDomainHostdevPrivate);
++
++virObject *
++qemuDomainHostdevPrivateNew(void)
++{
++    qemuDomainHostdevPrivate *priv;
++
++    if (qemuDomainHostdevPrivateInitialize() < 0)
++        return NULL;
++
++    if (!(priv = virObjectNew(qemuDomainHostdevPrivateClass)))
++        return NULL;
++
++    priv->vfioDeviceFd = -1;
++
++    return (virObject *) priv;
++}
++
++
+ /* qemuDomainSecretInfoSetup:
+  * @priv: pointer to domain private object
+  * @alias: alias of the secret
+@@ -3563,6 +3602,7 @@ virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks = {
+     .chrSourceNew = qemuDomainChrSourcePrivateNew,
+     .vsockNew = qemuDomainVsockPrivateNew,
+     .graphicsNew = qemuDomainGraphicsPrivateNew,
++    .hostdevNew = qemuDomainHostdevPrivateNew,
+     .networkNew = qemuDomainNetworkPrivateNew,
+     .networkParse = qemuDomainNetworkPrivateParse,
+     .networkFormat = qemuDomainNetworkPrivateFormat,
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index b9bb338682..88c8416aa4 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -461,6 +461,18 @@ struct _qemuDomainTPMPrivate {
+ };
+ 
+ 
++#define QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev) \
++    ((qemuDomainHostdevPrivate *) (hostdev)->privateData)
++
++typedef struct _qemuDomainHostdevPrivate qemuDomainHostdevPrivate;
++struct _qemuDomainHostdevPrivate {
++    virObject parent;
++
++    /* VFIO device file descriptor for iommufd passthrough */
++    int vfioDeviceFd;
++};
++
++
+ void
+ qemuDomainNetworkPrivateClearFDs(qemuDomainNetworkPrivate *priv);
+ 
+@@ -1175,3 +1187,6 @@ qemuDomainCheckCPU(virArch arch,
+ bool
+ qemuDomainMachineSupportsFloppy(const char *machine,
+                                 virQEMUCaps *qemuCaps);
++
++virObject *
++qemuDomainHostdevPrivateNew(void);
+diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
+index 26c5fdfef6..d2a8cf8da4 100644
+--- a/src/vbox/vbox_common.c
++++ b/src/vbox/vbox_common.c
+@@ -3090,7 +3090,7 @@ vboxHostDeviceGetXMLDesc(struct _vboxDriver *data, virDomainDef *def, IMachine *
+     def->hostdevs = g_new0(virDomainHostdevDef *, def->nhostdevs);
+ 
+     for (i = 0; i < def->nhostdevs; i++)
+-        def->hostdevs[i] = virDomainHostdevDefNew();
++        def->hostdevs[i] = virDomainHostdevDefNew(NULL);
+ 
+     for (i = 0; i < deviceFilters.count; i++) {
+         PRBool active = PR_FALSE;
+diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c
+index aec474a148..a35c1d9402 100644
+--- a/tests/virhostdevtest.c
++++ b/tests/virhostdevtest.c
+@@ -124,7 +124,7 @@ myInit(void)
+ 
+     for (i = 0; i < nhostdevs; i++) {
+         virDomainHostdevSubsys *subsys;
+-        hostdevs[i] = virDomainHostdevDefNew();
++        hostdevs[i] = virDomainHostdevDefNew(NULL);
+         if (!hostdevs[i])
+             goto cleanup;
+         hostdevs[i]->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS;
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemu-Move-IOMMUFD-validation-to-qemu_validate.patch b/SOURCES/libvirt-qemu-Move-IOMMUFD-validation-to-qemu_validate.patch
new file mode 100644
index 0000000..6afddb1
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Move-IOMMUFD-validation-to-qemu_validate.patch
@@ -0,0 +1,111 @@
+From 38c43950b3f6327e5d51e6751415208e5a467bed Mon Sep 17 00:00:00 2001
+Message-ID: <38c43950b3f6327e5d51e6751415208e5a467bed.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Mon, 16 Feb 2026 09:12:02 +0100
+Subject: [PATCH] qemu: Move IOMMUFD validation to qemu_validate
+
+Fail early if kernel doesn't support IOMMUFD.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 0c1af67be554d4daa2facfb647ce6e9914da2f06)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/libvirt_private.syms |  1 +
+ src/qemu/qemu_process.c  |  8 +-------
+ src/qemu/qemu_validate.c |  7 +++++++
+ src/util/viriommufd.c    | 13 +++++++++++++
+ src/util/viriommufd.h    |  2 ++
+ 5 files changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index e2a7a16347..0904265459 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -2654,6 +2654,7 @@ virInitctlSetRunLevel;
+ 
+ # util/viriommufd.h
+ virIOMMUFDSetRLimitMode;
++virIOMMUFDSupported;
+ 
+ # util/viriscsi.h
+ virISCSIConnectionLogin;
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 37e688018c..479437fb34 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7690,13 +7690,7 @@ qemuProcessOpenIommuFd(virDomainObj *vm)
+     VIR_DEBUG("Opening IOMMU FD for domain %s", vm->def->name);
+ 
+     if ((fd = open(VIR_IOMMU_DEV_PATH, O_RDWR | O_CLOEXEC)) < 0) {
+-        if (errno == ENOENT) {
+-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+-                           _("IOMMU FD support requires /dev/iommu device"));
+-        } else {
+-            virReportSystemError(errno, "%s",
+-                                 _("cannot open /dev/iommu"));
+-        }
++        virReportSystemError(errno, "%s", _("cannot open /dev/iommu"));
+         return -1;
+     }
+ 
+diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
+index 9886ddaf1d..5c8c21335d 100644
+--- a/src/qemu/qemu_validate.c
++++ b/src/qemu/qemu_validate.c
+@@ -27,6 +27,7 @@
+ #include "qemu_process.h"
+ #include "domain_conf.h"
+ #include "virbitmap.h"
++#include "viriommufd.h"
+ #include "virlog.h"
+ #include "virutil.h"
+ 
+@@ -2727,6 +2728,12 @@ qemuValidateDomainDeviceDefHostdev(const virDomainHostdevDef *hostdev,
+                                        _("IOMMUFD is not supported by this version of qemu"));
+                         return -1;
+                     }
++
++                    if (!virIOMMUFDSupported()) {
++                        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                                       _("IOMMUFD is not supported by host kernel"));
++                        return -1;
++                    }
+                 }
+             }
+ 
+diff --git a/src/util/viriommufd.c b/src/util/viriommufd.c
+index 5af097683d..44b30029a5 100644
+--- a/src/util/viriommufd.c
++++ b/src/util/viriommufd.c
+@@ -88,3 +88,16 @@ int virIOMMUFDSetRLimitMode(int fd G_GNUC_UNUSED,
+ }
+ 
+ #endif
++
++/**
++ * virIOMMUFDSupported:
++ *
++ * Check the presence of IOMMU device.
++ *
++ * Retruns: true if it exists, false otherwise
++ */
++bool
++virIOMMUFDSupported(void)
++{
++    return virFileExists(VIR_IOMMU_DEV_PATH);
++}
+diff --git a/src/util/viriommufd.h b/src/util/viriommufd.h
+index ebecfe3633..ec6be9fa66 100644
+--- a/src/util/viriommufd.h
++++ b/src/util/viriommufd.h
+@@ -23,3 +23,5 @@
+ #define VIR_IOMMU_DEV_PATH "/dev/iommu"
+ 
+ int virIOMMUFDSetRLimitMode(int fd, bool processAccounting);
++
++bool virIOMMUFDSupported(void);
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-Properly-propagate-migration-state-to-TPM-cleanup-code.patch b/SOURCES/libvirt-qemu-Properly-propagate-migration-state-to-TPM-cleanup-code.patch
deleted file mode 100644
index 1060783..0000000
--- a/SOURCES/libvirt-qemu-Properly-propagate-migration-state-to-TPM-cleanup-code.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From b6e803fc90bb9d49345adca4f38856ce97fde9f8 Mon Sep 17 00:00:00 2001
-Message-ID: <b6e803fc90bb9d49345adca4f38856ce97fde9f8.1744876588.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 9 Apr 2025 15:35:20 +0200
-Subject: [PATCH] qemu: Properly propagate migration state to TPM cleanup code
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When migrating a domain with TPM state on a shared disk, we need to skip
-TPM cleanup on both ends. So far the code only handled successful
-migration and skipped the cleanup on the source host. But if the
-migration failed for some reason, the cleanup would be incorrectly
-called on the destination host removing the TPM files even though the
-domain was still running on the source host.
-
-https://issues.redhat.com/browse/RHEL-82411
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 97ed7f22b089c5fdd9ee02cffc6854f6e021ab2b)
-
-https://issues.redhat.com/browse/RHEL-86800
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_driver.c    | 7 +++++--
- src/qemu/qemu_migration.c | 6 +++---
- src/qemu/qemu_process.c   | 8 ++------
- 3 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index f8f3d2c725..4c6eff9286 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -3853,6 +3853,7 @@ processMonitorEOFEvent(virQEMUDriver *driver,
-     const char *auditReason = "shutdown";
-     unsigned int stopFlags = 0;
-     virObjectEvent *event = NULL;
-+    bool migration;
- 
-     if (vm->def->id != domid) {
-         VIR_DEBUG("Domain %s was restarted, ignoring EOF",
-@@ -3863,6 +3864,8 @@ processMonitorEOFEvent(virQEMUDriver *driver,
-     if (qemuProcessBeginStopJob(vm, VIR_JOB_DESTROY, true) < 0)
-         return;
- 
-+    migration = vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_IN;
-+
-     if (!virDomainObjIsActive(vm)) {
-         VIR_DEBUG("Domain %p '%s' is not active, ignoring EOF",
-                   vm, vm->def->name);
-@@ -3877,7 +3880,7 @@ processMonitorEOFEvent(virQEMUDriver *driver,
-         auditReason = "failed";
-     }
- 
--    if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_IN) {
-+    if (migration) {
-         stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
-         qemuMigrationDstErrorSave(driver, vm->def->name,
-                                   qemuMonitorLastError(priv->mon));
-@@ -3890,7 +3893,7 @@ processMonitorEOFEvent(virQEMUDriver *driver,
-     virObjectEventStateQueue(driver->domainEventState, event);
- 
-  endjob:
--    qemuDomainRemoveInactive(driver, vm, 0, false);
-+    qemuDomainRemoveInactive(driver, vm, 0, migration);
-     qemuProcessEndStopJob(vm);
- }
- 
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 62da892254..5cb7642315 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -3592,7 +3592,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
-          * and there is no 'goto cleanup;' in the middle of those */
-         VIR_FREE(priv->origname);
-         virDomainObjRemoveTransientDef(vm);
--        qemuDomainRemoveInactive(driver, vm, 0, false);
-+        qemuDomainRemoveInactive(driver, vm, 0, true);
-     }
-     virDomainObjEndAPI(&vm);
-     virErrorRestore(&origErr);
-@@ -6963,7 +6963,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
-     }
- 
-     if (!qemuDomainObjIsActive(vm))
--        qemuDomainRemoveInactive(driver, vm, VIR_DOMAIN_UNDEFINE_TPM, false);
-+        qemuDomainRemoveInactive(driver, vm, VIR_DOMAIN_UNDEFINE_TPM, true);
- 
-     virErrorRestore(&orig_err);
-     return NULL;
-@@ -7099,7 +7099,7 @@ qemuMigrationProcessUnattended(virQEMUDriver *driver,
-     qemuMigrationJobFinish(vm);
- 
-     if (!virDomainObjIsActive(vm))
--        qemuDomainRemoveInactive(driver, vm, 0, false);
-+        qemuDomainRemoveInactive(driver, vm, 0, true);
- }
- 
- 
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index fac5678439..ad7e99750f 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -8731,7 +8731,6 @@ void qemuProcessStop(virQEMUDriver *driver,
-     size_t i;
-     g_autofree char *timestamp = NULL;
-     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
--    bool outgoingMigration;
- 
-     VIR_DEBUG("Shutting down vm=%p name=%s id=%d pid=%lld, "
-               "reason=%s, asyncJob=%s, flags=0x%x",
-@@ -8807,10 +8806,7 @@ void qemuProcessStop(virQEMUDriver *driver,
- 
-     qemuDomainCleanupRun(driver, vm);
- 
--    outgoingMigration = (flags & VIR_QEMU_PROCESS_STOP_MIGRATED) &&
--        (asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT);
--
--    qemuExtDevicesStop(driver, vm, outgoingMigration);
-+    qemuExtDevicesStop(driver, vm, !!(flags & VIR_QEMU_PROCESS_STOP_MIGRATED));
- 
-     qemuDBusStop(driver, vm);
- 
-@@ -9070,7 +9066,7 @@ qemuProcessAutoDestroy(virDomainObj *dom,
-                                      VIR_DOMAIN_EVENT_STOPPED,
-                                      VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
- 
--    qemuDomainRemoveInactive(driver, dom, 0, false);
-+    qemuDomainRemoveInactive(driver, dom, 0, !!(stopFlags & VIR_QEMU_PROCESS_STOP_MIGRATED));
- 
-     qemuProcessEndStopJob(dom);
- 
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-Rename-diskAlias-to-device-in-qemu-IO-error-event-handling.patch b/SOURCES/libvirt-qemu-Rename-diskAlias-to-device-in-qemu-IO-error-event-handling.patch
deleted file mode 100644
index 1a84689..0000000
--- a/SOURCES/libvirt-qemu-Rename-diskAlias-to-device-in-qemu-IO-error-event-handling.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 88fab9d6fe37abb85c3c4b51c046b49e1601b5da Mon Sep 17 00:00:00 2001
-Message-ID: <88fab9d6fe37abb85c3c4b51c046b49e1601b5da.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 27 Jan 2025 13:42:36 +0100
-Subject: [PATCH] qemu: Rename 'diskAlias' to 'device' in qemu IO error event
- handling
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The field is named 'device' in the event so unify our naming.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 2d6bd6f05fc57839093850ebfc06c9b4e02b4f67)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/qemu/qemu_monitor.c | 4 ++--
- src/qemu/qemu_monitor.h | 4 ++--
- src/qemu/qemu_process.c | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 79bd91b539..e98da5fbff 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -1127,7 +1127,7 @@ qemuMonitorEmitWatchdog(qemuMonitor *mon, int action)
- 
- void
- qemuMonitorEmitIOError(qemuMonitor *mon,
--                       const char *diskAlias,
-+                       const char *device,
-                        const char *nodename,
-                        int action,
-                        const char *reason)
-@@ -1135,7 +1135,7 @@ qemuMonitorEmitIOError(qemuMonitor *mon,
-     VIR_DEBUG("mon=%p", mon);
- 
-     QEMU_MONITOR_CALLBACK(mon, domainIOError, mon->vm,
--                          diskAlias, nodename, action, reason);
-+                          device, nodename, action, reason);
- }
- 
- 
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 89a59dfd27..0ab60f286d 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -206,7 +206,7 @@ typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon,
-                                                   int action);
- typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
-                                                  virDomainObj *vm,
--                                                 const char *diskAlias,
-+                                                 const char *device,
-                                                  const char *nodename,
-                                                  int action,
-                                                  const char *reason);
-@@ -450,7 +450,7 @@ void qemuMonitorEmitResume(qemuMonitor *mon);
- void qemuMonitorEmitRTCChange(qemuMonitor *mon, long long offset);
- void qemuMonitorEmitWatchdog(qemuMonitor *mon, int action);
- void qemuMonitorEmitIOError(qemuMonitor *mon,
--                            const char *diskAlias,
-+                            const char *device,
-                             const char *nodename,
-                             int action,
-                             const char *reason);
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index b4f6d358f3..3861d91228 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -824,7 +824,7 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED,
- static void
- qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-                          virDomainObj *vm,
--                         const char *diskAlias,
-+                         const char *device,
-                          const char *nodename,
-                          int action,
-                          const char *reason)
-@@ -840,8 +840,8 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-     virObjectLock(vm);
-     priv = QEMU_DOMAIN_PRIVATE(vm);
- 
--    if (diskAlias)
--        disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL);
-+    if (device)
-+        disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, device, NULL);
-     else if (nodename)
-         disk = qemuDomainDiskLookupByNodename(vm->def, NULL, nodename, NULL);
-     else
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-Rename-outgoingMigration-parameter-in-various-TPM-functions.patch b/SOURCES/libvirt-qemu-Rename-outgoingMigration-parameter-in-various-TPM-functions.patch
deleted file mode 100644
index ed7eb10..0000000
--- a/SOURCES/libvirt-qemu-Rename-outgoingMigration-parameter-in-various-TPM-functions.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-From c28859cbaeac298adbe957956cf8442c9a6b7264 Mon Sep 17 00:00:00 2001
-Message-ID: <c28859cbaeac298adbe957956cf8442c9a6b7264.1744876588.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 11 Mar 2025 10:05:28 +0100
-Subject: [PATCH] qemu: Rename outgoingMigration parameter in various TPM
- functions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The parameter is used to skip TPM state cleanup on outgoing migration
-with shared storage. But we also need to skip the cleanup after a failed
-incoming migration. Let's call the parameter "migration" to reflect its
-usage on both sides of migration.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit a5e4ca6f02dc8250f84163a0d19b69300affde43)
-
-https://issues.redhat.com/browse/RHEL-86800
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_domain.c    |  8 ++++----
- src/qemu/qemu_domain.h    |  2 +-
- src/qemu/qemu_extdevice.c |  8 ++++----
- src/qemu/qemu_extdevice.h |  4 ++--
- src/qemu/qemu_tpm.c       | 19 +++++++++----------
- src/qemu/qemu_tpm.h       |  4 ++--
- 6 files changed, 22 insertions(+), 23 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 1ccaff90d9..89e1b50366 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -5749,7 +5749,7 @@ static void
- qemuDomainRemoveInactiveCommon(virQEMUDriver *driver,
-                                virDomainObj *vm,
-                                virDomainUndefineFlagsValues flags,
--                               bool outgoingMigration)
-+                               bool migration)
- {
-     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-     g_autofree char *snapDir = NULL;
-@@ -5775,7 +5775,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriver *driver,
-         if (rmdir(chkDir) < 0 && errno != ENOENT)
-             VIR_WARN("unable to remove checkpoint directory %s", chkDir);
-     }
--    qemuExtDevicesCleanupHost(driver, vm->def, flags, outgoingMigration);
-+    qemuExtDevicesCleanupHost(driver, vm->def, flags, migration);
- }
- 
- 
-@@ -5788,14 +5788,14 @@ void
- qemuDomainRemoveInactive(virQEMUDriver *driver,
-                          virDomainObj *vm,
-                          virDomainUndefineFlagsValues flags,
--                         bool outgoingMigration)
-+                         bool migration)
- {
-     if (vm->persistent) {
-         /* Short-circuit, we don't want to remove a persistent domain */
-         return;
-     }
- 
--    qemuDomainRemoveInactiveCommon(driver, vm, flags, outgoingMigration);
-+    qemuDomainRemoveInactiveCommon(driver, vm, flags, migration);
- 
-     virDomainObjListRemove(driver->domains, vm);
- }
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index e810f79599..6246988491 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -689,7 +689,7 @@ int qemuDomainMomentDiscardAll(void *payload,
- void qemuDomainRemoveInactive(virQEMUDriver *driver,
-                               virDomainObj *vm,
-                               virDomainUndefineFlagsValues flags,
--                              bool outgoingMigration);
-+                              bool migration);
- 
- void
- qemuDomainRemoveInactiveLocked(virQEMUDriver *driver,
-diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
-index 2384bab7a6..7451e0fa03 100644
---- a/src/qemu/qemu_extdevice.c
-+++ b/src/qemu/qemu_extdevice.c
-@@ -154,7 +154,7 @@ void
- qemuExtDevicesCleanupHost(virQEMUDriver *driver,
-                           virDomainDef *def,
-                           virDomainUndefineFlagsValues flags,
--                          bool outgoingMigration)
-+                          bool migration)
- {
-     size_t i;
- 
-@@ -165,7 +165,7 @@ qemuExtDevicesCleanupHost(virQEMUDriver *driver,
-         virDomainTPMDef *tpm = def->tpms[i];
- 
-         if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR)
--            qemuExtTPMCleanupHost(driver, tpm, flags, outgoingMigration);
-+            qemuExtTPMCleanupHost(driver, tpm, flags, migration);
-     }
- }
- 
-@@ -266,7 +266,7 @@ qemuExtDevicesStart(virQEMUDriver *driver,
- void
- qemuExtDevicesStop(virQEMUDriver *driver,
-                    virDomainObj *vm,
--                   bool outgoingMigration)
-+                   bool migration)
- {
-     virDomainDef *def = vm->def;
-     size_t i;
-@@ -283,7 +283,7 @@ qemuExtDevicesStop(virQEMUDriver *driver,
- 
-     for (i = 0; i < def->ntpms; i++) {
-         if (def->tpms[i]->type == VIR_DOMAIN_TPM_TYPE_EMULATOR)
--            qemuExtTPMStop(driver, vm, outgoingMigration);
-+            qemuExtTPMStop(driver, vm, migration);
-     }
- 
-     for (i = 0; i < def->nnets; i++) {
-diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h
-index d4ac9f395c..36f7fb77a8 100644
---- a/src/qemu/qemu_extdevice.h
-+++ b/src/qemu/qemu_extdevice.h
-@@ -48,7 +48,7 @@ int qemuExtDevicesPrepareHost(virQEMUDriver *driver,
- void qemuExtDevicesCleanupHost(virQEMUDriver *driver,
-                                virDomainDef *def,
-                                virDomainUndefineFlagsValues flags,
--                               bool outgoingMigration)
-+                               bool migration)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
- 
- int qemuExtDevicesStart(virQEMUDriver *driver,
-@@ -59,7 +59,7 @@ int qemuExtDevicesStart(virQEMUDriver *driver,
- 
- void qemuExtDevicesStop(virQEMUDriver *driver,
-                         virDomainObj *vm,
--                        bool outgoingMigration)
-+                        bool migration)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
- 
- bool qemuExtDevicesHasDevice(virDomainDef *def);
-diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
-index f5e0184e54..f910a26286 100644
---- a/src/qemu/qemu_tpm.c
-+++ b/src/qemu/qemu_tpm.c
-@@ -907,7 +907,8 @@ qemuTPMEmulatorInitPaths(virDomainTPMDef *tpm,
-  * @driver: QEMU driver
-  * @tpm: TPM definition
-  * @flags: flags indicating whether to keep or remove TPM persistent state
-- * @outgoingMigration: whether cleanup is due to an outgoing migration
-+ * @migration: whether cleanup is due to a successful outgoing or failed
-+ *      incoming migration
-  *
-  * Clean up persistent storage for the swtpm.
-  */
-@@ -915,14 +916,12 @@ static void
- qemuTPMEmulatorCleanupHost(virQEMUDriver *driver,
-                            virDomainTPMDef *tpm,
-                            virDomainUndefineFlagsValues flags,
--                           bool outgoingMigration)
-+                           bool migration)
- {
-     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
- 
--    /* Never remove the state in case of outgoing migration with shared
--     * storage.
--     */
--    if (outgoingMigration &&
-+    /* Never remove the state in case of migration with shared storage. */
-+    if (migration &&
-         virFileIsSharedFS(tpm->data.emulator.source_path, cfg->sharedFilesystems) == 1)
-         return;
- 
-@@ -1293,9 +1292,9 @@ void
- qemuExtTPMCleanupHost(virQEMUDriver *driver,
-                       virDomainTPMDef *tpm,
-                       virDomainUndefineFlagsValues flags,
--                      bool outgoingMigration)
-+                      bool migration)
- {
--    qemuTPMEmulatorCleanupHost(driver, tpm, flags, outgoingMigration);
-+    qemuTPMEmulatorCleanupHost(driver, tpm, flags, migration);
- }
- 
- 
-@@ -1319,7 +1318,7 @@ qemuExtTPMStart(virQEMUDriver *driver,
- void
- qemuExtTPMStop(virQEMUDriver *driver,
-                virDomainObj *vm,
--               bool outgoingMigration)
-+               bool migration)
- {
-     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-     g_autofree char *shortName = virDomainDefGetShortName(vm->def);
-@@ -1329,7 +1328,7 @@ qemuExtTPMStop(virQEMUDriver *driver,
-         return;
- 
-     qemuTPMEmulatorStop(cfg->swtpmStateDir, shortName);
--    if (outgoingMigration && qemuTPMHasSharedStorage(driver, vm->def))
-+    if (migration && qemuTPMHasSharedStorage(driver, vm->def))
-         restoreTPMStateLabel = false;
- 
-     if (qemuSecurityRestoreTPMLabels(driver, vm, restoreTPMStateLabel, false) < 0)
-diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h
-index 7096060a2a..37813087cf 100644
---- a/src/qemu/qemu_tpm.h
-+++ b/src/qemu/qemu_tpm.h
-@@ -38,7 +38,7 @@ int qemuExtTPMPrepareHost(virQEMUDriver *driver,
- void qemuExtTPMCleanupHost(virQEMUDriver *driver,
-                            virDomainTPMDef *tpm,
-                            virDomainUndefineFlagsValues flags,
--                           bool outgoingMigration)
-+                           bool migration)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
- 
- int qemuExtTPMStart(virQEMUDriver *driver,
-@@ -52,7 +52,7 @@ int qemuExtTPMStart(virQEMUDriver *driver,
- 
- void qemuExtTPMStop(virQEMUDriver *driver,
-                     virDomainObj *vm,
--                    bool outgoingMigration)
-+                    bool migration)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
- 
- int qemuExtTPMSetupCgroup(virQEMUDriver *driver,
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-Save-IOMMUFD-state-into-status-XML.patch b/SOURCES/libvirt-qemu-Save-IOMMUFD-state-into-status-XML.patch
new file mode 100644
index 0000000..06f671e
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Save-IOMMUFD-state-into-status-XML.patch
@@ -0,0 +1,79 @@
+From c061be3f01ee2e1b6138a440bbd137bdb71e785f Mon Sep 17 00:00:00 2001
+Message-ID: <c061be3f01ee2e1b6138a440bbd137bdb71e785f.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sat, 14 Feb 2026 17:54:57 +0100
+Subject: [PATCH] qemu: Save IOMMUFD state into status XML
+
+We need to track if iommufd object was added to the VM when we add
+hotplug support.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit b21b6dcc72f1853f103f3cfbe1ebbcfbf128b458)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_command.c | 2 ++
+ src/qemu/qemu_domain.c  | 6 ++++++
+ src/qemu/qemu_domain.h  | 1 +
+ 3 files changed, 9 insertions(+)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 445d328358..b866c690ae 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -5359,6 +5359,8 @@ qemuBuildIOMMUFDCommandLine(virCommand *cmd,
+     if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0)
+         return -1;
+ 
++    priv->iommufdState = true;
++
+     return 0;
+ }
+ 
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index ada9d3431c..ccbfc8bac7 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1976,6 +1976,7 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivate *priv)
+     priv->migrationRecoverSetup = false;
+ 
+     g_clear_pointer(&priv->iommufd, qemuFDPassDirectFree);
++    priv->iommufdState = false;
+ 
+     g_clear_pointer(&priv->memoryBackingDir, g_free);
+ }
+@@ -2844,6 +2845,9 @@ qemuDomainObjPrivateXMLFormat(virBuffer *buf,
+                           priv->preMigrationMemlock);
+     }
+ 
++    if (priv->iommufdState)
++        virBufferAddLit(buf, "<iommufd/>\n");
++
+     return 0;
+ }
+ 
+@@ -3582,6 +3586,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
+         return -1;
+     }
+ 
++    priv->iommufdState = virXPathBoolean("boolean(./iommufd)", ctxt) == 1;
++
+     return 0;
+ }
+ 
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index 8aa94fc25b..62c5252b9f 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -265,6 +265,7 @@ struct _qemuDomainObjPrivate {
+     GHashTable *fds;
+ 
+     qemuFDPassDirect *iommufd;
++    bool iommufdState; /* true if --object iommufd was added */
+ 
+     char *memoryBackingDir;
+ };
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-Setup-disk-latency-histograms-on-startup-hotplug-update.patch b/SOURCES/libvirt-qemu-Setup-disk-latency-histograms-on-startup-hotplug-update.patch
new file mode 100644
index 0000000..06eb305
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Setup-disk-latency-histograms-on-startup-hotplug-update.patch
@@ -0,0 +1,132 @@
+From 8ea558c6eff6cc3b968b1124ad4e005bb3844d74 Mon Sep 17 00:00:00 2001
+Message-ID: <8ea558c6eff6cc3b968b1124ad4e005bb3844d74.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 23 Jan 2026 17:18:14 +0100
+Subject: [PATCH] qemu: Setup disk latency histograms on startup/hotplug/update
+
+Setup the histograms on startup and hotplug of devices via
+'qemuProcessSetupDiskPropsRuntime' and facilitate update/reset/disable
+of histogram collection via 'qemuDomainChangeDiskLive'.
+
+The latter allows to use the update device API to either clear the bins
+or select new bin configuration or disable the histogram altogether
+without the need for a specific API.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 5787326541be4eafaa7ae3b4f866b3da793d44fe)
+
+https://issues.redhat.com/browse/RHEL-147866 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-131335 [rhel-10.2]
+---
+ src/qemu/qemu_domain.c  | 17 +++++++++++++++++
+ src/qemu/qemu_domain.h  |  3 +++
+ src/qemu/qemu_hotplug.c | 29 +++++++++++++++++++++++++++++
+ src/qemu/qemu_process.c | 10 ++++++++++
+ 4 files changed, 59 insertions(+)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 8e1ebe7799..bdab117e96 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -10463,6 +10463,23 @@ qemuDomainInitializePflashStorageSource(virDomainObj *vm,
+ }
+ 
+ 
++/**
++ * qemuDomainDiskHasLatencyHistogram:
++ * @disk: disk definition
++ *
++ * Returns whether @disk has any latency histogram settings configured.
++ */
++bool
++qemuDomainDiskHasLatencyHistogram(virDomainDiskDef *disk)
++{
++    return disk->histogram_boundaries ||
++           disk->histogram_boundaries_read ||
++           disk->histogram_boundaries_write ||
++           disk->histogram_boundaries_zone ||
++           disk->histogram_boundaries_flush;
++}
++
++
+ /**
+  * qemuDomainDiskBlockJobIsSupported:
+  *
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index 3361e97315..30ca67bf76 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -1078,6 +1078,9 @@ int
+ qemuDomainInitializePflashStorageSource(virDomainObj *vm,
+                                         virQEMUDriverConfig *cfg);
+ 
++bool
++qemuDomainDiskHasLatencyHistogram(virDomainDiskDef *disk);
++
+ bool
+ qemuDomainDiskBlockJobIsSupported(virDomainDiskDef *disk);
+ 
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index f2dc4469a3..9445599d2c 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -7310,6 +7310,35 @@ qemuDomainChangeDiskLive(virDomainObj *vm,
+         dev->data.disk->src = NULL;
+     }
+ 
++    if (qemuDomainDiskHasLatencyHistogram(disk) ||
++        qemuDomainDiskHasLatencyHistogram(orig_disk)) {
++        int rc;
++
++        qemuDomainObjEnterMonitor(vm);
++        rc = qemuMonitorBlockLatencyHistogramSet(qemuDomainGetMonitor(vm),
++                                                 QEMU_DOMAIN_DISK_PRIVATE(orig_disk)->qomName,
++                                                 disk->histogram_boundaries,
++                                                 disk->histogram_boundaries_read,
++                                                 disk->histogram_boundaries_write,
++                                                 disk->histogram_boundaries_zone,
++                                                 disk->histogram_boundaries_flush);
++        qemuDomainObjExitMonitor(vm);
++
++        if (rc < 0)
++            return -1;
++
++        g_clear_pointer(&orig_disk->histogram_boundaries, g_free);
++        g_clear_pointer(&orig_disk->histogram_boundaries_read, g_free);
++        g_clear_pointer(&orig_disk->histogram_boundaries_write, g_free);
++        g_clear_pointer(&orig_disk->histogram_boundaries_zone, g_free);
++        g_clear_pointer(&orig_disk->histogram_boundaries_flush, g_free);
++        orig_disk->histogram_boundaries = g_steal_pointer(&disk->histogram_boundaries);
++        orig_disk->histogram_boundaries_read = g_steal_pointer(&disk->histogram_boundaries_read);
++        orig_disk->histogram_boundaries_write = g_steal_pointer(&disk->histogram_boundaries_write);
++        orig_disk->histogram_boundaries_zone = g_steal_pointer(&disk->histogram_boundaries_zone);
++        orig_disk->histogram_boundaries_flush = g_steal_pointer(&disk->histogram_boundaries_flush);
++    }
++
+     /* in case when we aren't updating disk source we update startup policy here */
+     orig_disk->startupPolicy = dev->data.disk->startupPolicy;
+     orig_disk->snapshot = dev->data.disk->snapshot;
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index aadfaa92b0..37e688018c 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7959,6 +7959,16 @@ qemuProcessSetupDiskPropsRuntime(qemuMonitor *mon,
+                                       &disk->blkdeviotune) < 0)
+         return -1;
+ 
++    if (qemuDomainDiskHasLatencyHistogram(disk) &&
++        qemuMonitorBlockLatencyHistogramSet(mon,
++                                            QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName,
++                                            disk->histogram_boundaries,
++                                            disk->histogram_boundaries_read,
++                                            disk->histogram_boundaries_write,
++                                            disk->histogram_boundaries_zone,
++                                            disk->histogram_boundaries_flush) < 0)
++        return -1;
++
+     return 0;
+ }
+ 
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-Support-per-process-memory-accounting-for-iommufd.patch b/SOURCES/libvirt-qemu-Support-per-process-memory-accounting-for-iommufd.patch
new file mode 100644
index 0000000..fa9e93d
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Support-per-process-memory-accounting-for-iommufd.patch
@@ -0,0 +1,211 @@
+From 282a5215343e081ff331d0d4b8f2d6474e47f5ad Mon Sep 17 00:00:00 2001
+Message-ID: <282a5215343e081ff331d0d4b8f2d6474e47f5ad.1770383236.git.jdenemar@redhat.com>
+From: Nathan Chen <nathanc@nvidia.com>
+Date: Fri, 30 Jan 2026 10:59:14 -0800
+Subject: [PATCH] qemu: Support per-process memory accounting for iommufd
+
+Implement the IOMMU_OPTION_RLIMIT_MODE
+ioctl to set per-process memory accounting for
+iommufd. This prevents ENOMEM errors from the
+default per-user memory accounting when multiple
+VMs under the libvirt-qemu user have their pinned
+memory summed and checked against a per-process
+RLIMIT_MEMLOCK limit.
+
+Signed-off-by: Nathan Chen <nathanc@nvidia.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit f91a07d0c8dd583928974e80bb13b54feb5aa908)
+
+Resolves: https://issues.redhat.com/browse/RHEL-126345
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ meson.build              |  1 +
+ po/POTFILES              |  1 +
+ src/libvirt_private.syms |  3 ++
+ src/util/meson.build     |  1 +
+ src/util/viriommufd.c    | 90 ++++++++++++++++++++++++++++++++++++++++
+ src/util/viriommufd.h    | 25 +++++++++++
+ 6 files changed, 121 insertions(+)
+ create mode 100644 src/util/viriommufd.c
+ create mode 100644 src/util/viriommufd.h
+
+diff --git a/meson.build b/meson.build
+index 6ac9d01952..28745e4e32 100644
+--- a/meson.build
++++ b/meson.build
+@@ -673,6 +673,7 @@ headers = [
+   'ifaddrs.h',
+   'libtasn1.h',
+   'linux/kvm.h',
++  'linux/iommufd.h',
+   'mntent.h',
+   'net/ethernet.h',
+   'net/if.h',
+diff --git a/po/POTFILES b/po/POTFILES
+index f0aad35c8c..c78d2b8000 100644
+--- a/po/POTFILES
++++ b/po/POTFILES
+@@ -303,6 +303,7 @@ src/util/virhostuptime.c
+ src/util/viridentity.c
+ src/util/virinhibitor.c
+ src/util/virinitctl.c
++src/util/viriommufd.c
+ src/util/viriscsi.c
+ src/util/virjson.c
+ src/util/virlease.c
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index 4e57e4a8f6..66261ed6cf 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -2652,6 +2652,9 @@ virInhibitorRelease;
+ virInitctlFifos;
+ virInitctlSetRunLevel;
+ 
++# util/viriommufd.h
++virIOMMUFDSetRLimitMode;
++
+ # util/viriscsi.h
+ virISCSIConnectionLogin;
+ virISCSIConnectionLogout;
+diff --git a/src/util/meson.build b/src/util/meson.build
+index 4950a795cc..9fb0aa0fe7 100644
+--- a/src/util/meson.build
++++ b/src/util/meson.build
+@@ -46,6 +46,7 @@ util_sources = [
+   'viridentity.c',
+   'virinhibitor.c',
+   'virinitctl.c',
++  'viriommufd.c',
+   'viriscsi.c',
+   'virjson.c',
+   'virkeycode.c',
+diff --git a/src/util/viriommufd.c b/src/util/viriommufd.c
+new file mode 100644
+index 0000000000..5af097683d
+--- /dev/null
++++ b/src/util/viriommufd.c
+@@ -0,0 +1,90 @@
++#include <config.h>
++
++#include "viriommufd.h"
++#include "virlog.h"
++#include "virerror.h"
++#include "virfile.h"
++
++#define VIR_FROM_THIS VIR_FROM_NONE
++
++VIR_LOG_INIT("util.iommufd");
++
++#ifdef __linux__
++
++# include <sys/ioctl.h>
++# include <linux/types.h>
++
++# ifdef HAVE_LINUX_IOMMUFD_H
++#  include <linux/iommufd.h>
++# endif
++
++# ifndef IOMMU_OPTION
++
++enum iommufd_option {
++    IOMMU_OPTION_RLIMIT_MODE = 0,
++    IOMMU_OPTION_HUGE_PAGES = 1,
++};
++
++enum iommufd_option_ops {
++    IOMMU_OPTION_OP_SET = 0,
++    IOMMU_OPTION_OP_GET = 1,
++};
++
++struct iommu_option {
++    __u32 size;
++    __u32 option_id;
++    __u16 op;
++    __u16 __reserved;
++    __u32 object_id;
++    __aligned_u64 val64;
++};
++
++#  define IOMMUFD_TYPE (';')
++#  define IOMMUFD_CMD_OPTION 0x87
++#  define IOMMU_OPTION _IO(IOMMUFD_TYPE, IOMMUFD_CMD_OPTION)
++
++# endif
++
++/**
++ * virIOMMUFDSetRLimitMode:
++ * @fd: iommufd file descriptor
++ * @processAccounting: true for per-process, false for per-user
++ *
++ * Set RLIMIT_MEMLOCK accounting mode for the iommufd.
++ *
++ * Returns: 0 on success, -1 on error
++ */
++int
++virIOMMUFDSetRLimitMode(int fd, bool processAccounting)
++{
++    struct iommu_option option = {
++        .size = sizeof(struct iommu_option),
++        .option_id = IOMMU_OPTION_RLIMIT_MODE,
++        .op = IOMMU_OPTION_OP_SET,
++        .__reserved = 0,
++        .object_id = 0,
++        .val64 = processAccounting ? 1 : 0,
++    };
++
++    if (ioctl(fd, IOMMU_OPTION, &option) < 0) {
++        virReportSystemError(errno, "%s",
++                             _("failed to set memory accounting for iommufd"));
++        return -1;
++    }
++
++    VIR_DEBUG("Set iommufd rlimit mode to %s-based accounting",
++              processAccounting ? "process" : "user");
++    return 0;
++}
++
++#else
++
++int virIOMMUFDSetRLimitMode(int fd G_GNUC_UNUSED,
++                            bool processAccounting G_GNUC_UNUSED)
++{
++    virReportError(VIR_ERR_NO_SUPPORT, "%s",
++                   _("IOMMUFD is not supported on this platform"));
++    return -1;
++}
++
++#endif
+diff --git a/src/util/viriommufd.h b/src/util/viriommufd.h
+new file mode 100644
+index 0000000000..ebecfe3633
+--- /dev/null
++++ b/src/util/viriommufd.h
+@@ -0,0 +1,25 @@
++/*
++ * viriommufd.h: iommufd helpers
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library.  If not, see
++ * <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include "internal.h"
++
++#define VIR_IOMMU_DEV_PATH "/dev/iommu"
++
++int virIOMMUFDSetRLimitMode(int fd, bool processAccounting);
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemu-Update-Cgroup-namespace-and-seclabel-for-iommufd.patch b/SOURCES/libvirt-qemu-Update-Cgroup-namespace-and-seclabel-for-iommufd.patch
new file mode 100644
index 0000000..cdee0a9
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Update-Cgroup-namespace-and-seclabel-for-iommufd.patch
@@ -0,0 +1,335 @@
+From 7db5ef1d0c015b39793065877742374cfc829b6b Mon Sep 17 00:00:00 2001
+Message-ID: <7db5ef1d0c015b39793065877742374cfc829b6b.1770383237.git.jdenemar@redhat.com>
+From: Nathan Chen <nathanc@nvidia.com>
+Date: Fri, 30 Jan 2026 10:59:17 -0800
+Subject: [PATCH] qemu: Update Cgroup, namespace, and seclabel for iommufd
+
+When launching a qemu VM with the iommufd feature enabled for VFIO
+hostdevs:
+- Do not allow cgroup, namespace, and seclabel access to VFIO
+paths (/dev/vfio/vfio and /dev/vfio/<iommugroup>)
+- Allow access to iommufd paths (/dev/iommu and
+/dev/vfio/devices/vfio*) for AppArmor, SELinux, and DAC
+
+Signed-off-by: Nathan Chen <nathanc@nvidia.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 7d2f91f9cb572ab95d0916bdd1a46dd198874529)
+
+Resolves: https://issues.redhat.com/browse/RHEL-126345
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_cgroup.c           |  3 ++
+ src/qemu/qemu_namespace.c        |  3 ++
+ src/security/security_apparmor.c | 28 ++++++++++++------
+ src/security/security_dac.c      | 49 +++++++++++++++++++++++++-------
+ src/security/security_selinux.c  | 47 +++++++++++++++++++++++-------
+ src/security/virt-aa-helper.c    | 32 ++++++++++++++++-----
+ 6 files changed, 127 insertions(+), 35 deletions(-)
+
+diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
+index 7dadef0739..6148990f19 100644
+--- a/src/qemu/qemu_cgroup.c
++++ b/src/qemu/qemu_cgroup.c
+@@ -479,6 +479,9 @@ qemuSetupHostdevCgroup(virDomainObj *vm,
+     g_autofree char *path = NULL;
+     int perms;
+ 
++    if (dev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES)
++        return 0;
++
+     if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES))
+         return 0;
+ 
+diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c
+index c689cc3e40..fb0734193d 100644
+--- a/src/qemu/qemu_namespace.c
++++ b/src/qemu/qemu_namespace.c
+@@ -345,6 +345,9 @@ qemuDomainSetupHostdev(virDomainObj *vm,
+ {
+     g_autofree char *path = NULL;
+ 
++    if (hostdev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES)
++        return 0;
++
+     if (qemuDomainGetHostdevPath(hostdev, &path, NULL) < 0)
+         return -1;
+ 
+diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
+index 68ac39611f..934acfb461 100644
+--- a/src/security/security_apparmor.c
++++ b/src/security/security_apparmor.c
+@@ -45,6 +45,7 @@
+ #include "virstring.h"
+ #include "virscsi.h"
+ #include "virmdev.h"
++#include "viriommufd.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_SECURITY
+ 
+@@ -841,25 +842,36 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *mgr,
+     }
+ 
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: {
+-        virPCIDevice *pci =
++        g_autoptr(virPCIDevice) pci =
+             virPCIDeviceNew(&pcisrc->addr);
+ 
+         if (!pci)
+             goto done;
+ 
+         if (pcisrc->driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
+-            char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
++            if (dev->source.subsys.u.pci.driver.iommufd != VIR_TRISTATE_BOOL_YES) {
++                char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
+ 
+-            if (!vfioGroupDev) {
+-                virPCIDeviceFree(pci);
+-                goto done;
++                if (!vfioGroupDev) {
++                    goto done;
++                }
++                ret = AppArmorSetSecurityPCILabel(pci, vfioGroupDev, ptr);
++                VIR_FREE(vfioGroupDev);
++            } else {
++                g_autofree char *vfiofdDev = NULL;
++
++                if (virPCIDeviceGetVfioPath(&dev->source.subsys.u.pci.addr, &vfiofdDev) < 0)
++                    goto done;
++
++                ret = AppArmorSetSecurityPCILabel(pci, vfiofdDev, ptr);
++                if (ret < 0)
++                    goto done;
++
++                ret = AppArmorSetSecurityPCILabel(pci, VIR_IOMMU_DEV_PATH, ptr);
+             }
+-            ret = AppArmorSetSecurityPCILabel(pci, vfioGroupDev, ptr);
+-            VIR_FREE(vfioGroupDev);
+         } else {
+             ret = virPCIDeviceFileIterate(pci, AppArmorSetSecurityPCILabel, ptr);
+         }
+-        virPCIDeviceFree(pci);
+         break;
+     }
+ 
+diff --git a/src/security/security_dac.c b/src/security/security_dac.c
+index 2f788b872a..d0ed22db2d 100644
+--- a/src/security/security_dac.c
++++ b/src/security/security_dac.c
+@@ -41,6 +41,7 @@
+ #include "virscsivhost.h"
+ #include "virstring.h"
+ #include "virutil.h"
++#include "viriommufd.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_SECURITY
+ 
+@@ -1282,14 +1283,27 @@ virSecurityDACSetHostdevLabel(virSecurityManager *mgr,
+             return -1;
+ 
+         if (pcisrc->driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
+-            g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
++            if (dev->source.subsys.u.pci.driver.iommufd != VIR_TRISTATE_BOOL_YES) {
++                g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
+ 
+-            if (!vfioGroupDev)
+-                return -1;
++                if (!vfioGroupDev)
++                    return -1;
+ 
+-            ret = virSecurityDACSetHostdevLabelHelper(vfioGroupDev,
+-                                                      false,
+-                                                      &cbdata);
++                ret = virSecurityDACSetHostdevLabelHelper(vfioGroupDev,
++                                                          false,
++                                                          &cbdata);
++            } else {
++                g_autofree char *vfiofdDev = NULL;
++
++                if (virPCIDeviceGetVfioPath(&dev->source.subsys.u.pci.addr, &vfiofdDev) < 0)
++                    return -1;
++
++                ret = virSecurityDACSetHostdevLabelHelper(vfiofdDev, false, &cbdata);
++                if (ret < 0)
++                    break;
++
++                ret = virSecurityDACSetHostdevLabelHelper(VIR_IOMMU_DEV_PATH, false, &cbdata);
++            }
+         } else {
+             ret = virPCIDeviceFileIterate(pci,
+                                           virSecurityDACSetPCILabel,
+@@ -1443,13 +1457,28 @@ virSecurityDACRestoreHostdevLabel(virSecurityManager *mgr,
+             return -1;
+ 
+         if (pcisrc->driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
+-            g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
++            if (dev->source.subsys.u.pci.driver.iommufd != VIR_TRISTATE_BOOL_YES) {
++                g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
+ 
+-            if (!vfioGroupDev)
+-                return -1;
++                if (!vfioGroupDev)
++                    return -1;
+ 
+-            ret = virSecurityDACRestoreFileLabelInternal(mgr, NULL,
++                ret = virSecurityDACRestoreFileLabelInternal(mgr, NULL,
+                                                          vfioGroupDev, false);
++            } else {
++                g_autofree char *vfiofdDev = NULL;
++
++                if (virPCIDeviceGetVfioPath(&dev->source.subsys.u.pci.addr, &vfiofdDev) < 0)
++                    return -1;
++
++                ret = virSecurityDACRestoreFileLabelInternal(mgr, NULL,
++                                                             vfiofdDev, false);
++                if (ret < 0)
++                    break;
++
++                ret = virSecurityDACRestoreFileLabelInternal(mgr, NULL,
++                                                             VIR_IOMMU_DEV_PATH, false);
++            }
+         } else {
+             ret = virPCIDeviceFileIterate(pci, virSecurityDACRestorePCILabel, mgr);
+         }
+diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
+index 2f3cc274a5..834383a7de 100644
+--- a/src/security/security_selinux.c
++++ b/src/security/security_selinux.c
+@@ -41,6 +41,7 @@
+ #include "virconf.h"
+ #include "virtpm.h"
+ #include "virstring.h"
++#include "viriommufd.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_SECURITY
+ 
+@@ -2256,14 +2257,27 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManager *mgr,
+             return -1;
+ 
+         if (pcisrc->driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
+-            g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
++            if (dev->source.subsys.u.pci.driver.iommufd != VIR_TRISTATE_BOOL_YES) {
++                g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
+ 
+-            if (!vfioGroupDev)
+-                return -1;
++                if (!vfioGroupDev)
++                    return -1;
+ 
+-            ret = virSecuritySELinuxSetHostdevLabelHelper(vfioGroupDev,
+-                                                          false,
+-                                                          &data);
++                ret = virSecuritySELinuxSetHostdevLabelHelper(vfioGroupDev,
++                                                              false,
++                                                              &data);
++            } else {
++                g_autofree char *vfiofdDev = NULL;
++
++                if (virPCIDeviceGetVfioPath(&dev->source.subsys.u.pci.addr, &vfiofdDev) < 0)
++                    return -1;
++
++                ret = virSecuritySELinuxSetHostdevLabelHelper(vfiofdDev, false, &data);
++                if (ret)
++                    break;
++
++                ret = virSecuritySELinuxSetHostdevLabelHelper(VIR_IOMMU_DEV_PATH, false, &data);
++            }
+         } else {
+             ret = virPCIDeviceFileIterate(pci, virSecuritySELinuxSetPCILabel, &data);
+         }
+@@ -2491,12 +2505,25 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManager *mgr,
+             return -1;
+ 
+         if (pcisrc->driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
+-            g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
++            if (dev->source.subsys.u.pci.driver.iommufd != VIR_TRISTATE_BOOL_YES) {
++                g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
+ 
+-            if (!vfioGroupDev)
+-                return -1;
++                if (!vfioGroupDev)
++                    return -1;
+ 
+-            ret = virSecuritySELinuxRestoreFileLabel(mgr, vfioGroupDev, false, false);
++                ret = virSecuritySELinuxRestoreFileLabel(mgr, vfioGroupDev, false, false);
++            } else {
++                g_autofree char *vfiofdDev = NULL;
++
++                if (virPCIDeviceGetVfioPath(&dev->source.subsys.u.pci.addr, &vfiofdDev) < 0)
++                    return -1;
++
++                ret = virSecuritySELinuxRestoreFileLabel(mgr, vfiofdDev, false, false);
++                if (ret < 0)
++                    break;
++
++                ret = virSecuritySELinuxRestoreFileLabel(mgr, VIR_IOMMU_DEV_PATH, false, false);
++            }
+         } else {
+             ret = virPCIDeviceFileIterate(pci, virSecuritySELinuxRestorePCILabel, mgr);
+         }
+diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
+index de0a826063..29e844c7ff 100644
+--- a/src/security/virt-aa-helper.c
++++ b/src/security/virt-aa-helper.c
+@@ -50,6 +50,7 @@
+ #include "virstring.h"
+ #include "virgettext.h"
+ #include "virhostdev.h"
++#include "viriommufd.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_SECURITY
+ 
+@@ -1114,8 +1115,9 @@ get_files(vahControl * ctl)
+ 
+             virDeviceHostdevPCIDriverName driverName = dev->source.subsys.u.pci.driver.name;
+ 
+-            if (driverName == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO ||
+-                driverName == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT) {
++            if ((driverName == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO ||
++                driverName == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT) &&
++                dev->source.subsys.u.pci.driver.iommufd != VIR_TRISTATE_BOOL_YES) {
+                 needsVfio = true;
+             }
+ 
+@@ -1385,9 +1387,18 @@ get_files(vahControl * ctl)
+         }
+     }
+ 
+-    if (ctl->newfile &&
+-        vah_add_file(&buf, ctl->newfile, "rwk") != 0) {
+-        return -1;
++    if (ctl->newfile) {
++        const char *perms = "rwk";
++
++        /* VFIO and iommufd devices need mmap permission */
++        if (STRPREFIX(ctl->newfile, "/dev/vfio/devices/vfio") ||
++            STREQ(ctl->newfile, VIR_IOMMU_DEV_PATH)) {
++            perms = "rwm";
++        }
++
++        if (vah_add_file(&buf, ctl->newfile, perms) != 0) {
++            return -1;
++        }
+     }
+ 
+     ctl->files = virBufferContentAndReset(&buf);
+@@ -1561,8 +1572,15 @@ main(int argc, char **argv)
+                 }
+         }
+         if (ctl->append && ctl->newfile) {
+-            if (vah_add_file(&buf, ctl->newfile, "rwk") != 0)
+-                goto cleanup;
++            const char *perms = "rwk";
++
++            if (STRPREFIX(ctl->newfile, "/dev/vfio/devices/vfio") ||
++                STREQ(ctl->newfile, VIR_IOMMU_DEV_PATH)) {
++                perms = "rwm";
++            }
++
++            if (vah_add_file(&buf, ctl->newfile, perms) != 0)
++                return -1;
+         } else {
+             if (ctl->def->virtType == VIR_DOMAIN_VIRT_QEMU ||
+                 ctl->def->virtType == VIR_DOMAIN_VIRT_KQEMU ||
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemu-Validate-virtio-mem-ccw.patch b/SOURCES/libvirt-qemu-Validate-virtio-mem-ccw.patch
deleted file mode 100644
index d79173f..0000000
--- a/SOURCES/libvirt-qemu-Validate-virtio-mem-ccw.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 6fa979b9735e988971203bca10903ba587a27f79 Mon Sep 17 00:00:00 2001
-Message-ID: <6fa979b9735e988971203bca10903ba587a27f79.1744876588.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 15 Jan 2025 15:48:41 +0100
-Subject: [PATCH] qemu: Validate virtio-mem-ccw
-
-There are basically two differences between virtio-mem-ccw and
-virtio-mem-pci. s390 doesn't allow mixing different page sizes
-and there's no NUMA support in QEMU.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit 541dfe40bc9b3fe90d488ab85df8ea3ea31b8249)
-Resolves: https://issues.redhat.com/browse/RHEL-72976
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_validate.c | 35 ++++++++++++++++++++++++++++++++---
- 1 file changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index 1c61038f93..97f8f58ffd 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -5259,7 +5259,8 @@ qemuValidateDomainDeviceDefHub(virDomainHubDef *hub,
- 
- 
- static int
--qemuValidateDomainDeviceDefMemory(virDomainMemoryDef *mem,
-+qemuValidateDomainDeviceDefMemory(const virDomainMemoryDef *mem,
-+                                  const virDomainDef *def,
-                                   virQEMUCaps *qemuCaps)
- {
-     virSGXCapability *sgxCaps;
-@@ -5298,12 +5299,40 @@ qemuValidateDomainDeviceDefMemory(virDomainMemoryDef *mem,
-         break;
- 
-     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
--        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI)) {
-+        if ((mem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI &&
-+             !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI)) ||
-+            (mem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW &&
-+             !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW))) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                            _("virtio-mem isn't supported by this QEMU binary"));
-             return -1;
-         }
- 
-+        if (mem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
-+            /* virtio-mem-ccw has a few differences compared to virtio-mem-pci:
-+             *
-+             * 1) corresponding memory-backing-* object can't have a different
-+             *    page size than the boot memory (see s390_machine_device_plug()
-+             *    in qemu sources).
-+             * 2) Since its commit v2.12.0-rc0~41^2~6 QEMU doesn't allow NUMA
-+             *    for s390.
-+             */
-+
-+            if (mem->source.virtio_mem.pagesize != 0 &&
-+                def->mem.nhugepages &&
-+                mem->source.virtio_mem.pagesize != def->mem.hugepages[0].size) {
-+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                               _("virtio-mem-ccw can't use different page size than the boot memory"));
-+                return -1;
-+            }
-+
-+            if (mem->targetNode != 0 && mem->targetNode != -1) {
-+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                               _("NUMA nodes are not supported for virtio-mem-ccw"));
-+                return -1;
-+            }
-+        }
-+
-         if (mem->target.virtio_mem.dynamicMemslots == VIR_TRISTATE_BOOL_YES &&
-             !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_DYNAMIC_MEMSLOTS)) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-@@ -5490,7 +5519,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef *dev,
-         return qemuValidateDomainDeviceDefSound(dev->data.sound, qemuCaps);
- 
-     case VIR_DOMAIN_DEVICE_MEMORY:
--        return qemuValidateDomainDeviceDefMemory(dev->data.memory, qemuCaps);
-+        return qemuValidateDomainDeviceDefMemory(dev->data.memory, def, qemuCaps);
- 
-     case VIR_DOMAIN_DEVICE_SHMEM:
-         return qemuValidateDomainDeviceDefShmem(dev->data.shmem, qemuCaps);
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-add-IOMMU-model-amd.patch b/SOURCES/libvirt-qemu-add-IOMMU-model-amd.patch
deleted file mode 100644
index ba02509..0000000
--- a/SOURCES/libvirt-qemu-add-IOMMU-model-amd.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-From 62862c4c7302758d304dd876f26712a75df26e08 Mon Sep 17 00:00:00 2001
-Message-ID: <62862c4c7302758d304dd876f26712a75df26e08.1752749355.git.jdenemar@redhat.com>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Fri, 14 Mar 2025 17:13:09 +0100
-Subject: [PATCH] qemu: add IOMMU model amd
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduce a new IOMMU device model 'amd', both the parser
-and the formatter for QEMU because of our enum warnings.
-
-https://issues.redhat.com/browse/RHEL-50560
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 14760600914ea6b5da778dd470823e734becf630)
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
----
- docs/formatdomain.rst                         |  5 ++-
- src/conf/domain_conf.c                        |  1 +
- src/conf/domain_conf.h                        |  1 +
- src/conf/domain_validate.c                    | 13 +++++++
- src/conf/schemas/domaincommon.rng             |  1 +
- src/qemu/qemu_command.c                       | 28 +++++++++++++
- src/qemu/qemu_domain_address.c                |  4 ++
- src/qemu/qemu_validate.c                      | 22 +++++++++++
- .../amd-iommu.x86_64-latest.args              | 35 +++++++++++++++++
- .../amd-iommu.x86_64-latest.xml               |  1 +
- tests/qemuxmlconfdata/amd-iommu.xml           | 39 +++++++++++++++++++
- tests/qemuxmlconftest.c                       |  2 +
- 12 files changed, 150 insertions(+), 2 deletions(-)
- create mode 100644 tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
- create mode 120000 tests/qemuxmlconfdata/amd-iommu.x86_64-latest.xml
- create mode 100644 tests/qemuxmlconfdata/amd-iommu.xml
-
-diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index a950ee1cb4..ec7bdb07d0 100644
---- a/docs/formatdomain.rst
-+++ b/docs/formatdomain.rst
-@@ -8841,8 +8841,9 @@ Example:
- 
- ``model``
-    Supported values are ``intel`` (for Q35 guests) ``smmuv3``
--   (:since:`since 5.5.0`, for ARM virt guests), and ``virtio``
--   (:since:`since 8.3.0`, for Q35 and ARM virt guests).
-+   (:since:`since 5.5.0`, for ARM virt guests), ``virtio``
-+   (:since:`since 8.3.0`, for Q35 and ARM virt guests) and
-+   ``amd`` (:since:`since 11.5.0`).
- 
- ``driver``
-    The ``driver`` subelement can be used to configure additional options, some
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 726c3095ed..7c8591e509 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -1349,6 +1349,7 @@ VIR_ENUM_IMPL(virDomainIOMMUModel,
-               "intel",
-               "smmuv3",
-               "virtio",
-+              "amd",
- );
- 
- VIR_ENUM_IMPL(virDomainVsockModel,
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 20be6f7c05..343bb9bae0 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -2973,6 +2973,7 @@ typedef enum {
-     VIR_DOMAIN_IOMMU_MODEL_INTEL,
-     VIR_DOMAIN_IOMMU_MODEL_SMMUV3,
-     VIR_DOMAIN_IOMMU_MODEL_VIRTIO,
-+    VIR_DOMAIN_IOMMU_MODEL_AMD,
- 
-     VIR_DOMAIN_IOMMU_MODEL_LAST
- } virDomainIOMMUModel;
-diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
-index 9cedc8d6d2..483cfbbe08 100644
---- a/src/conf/domain_validate.c
-+++ b/src/conf/domain_validate.c
-@@ -2986,6 +2986,18 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu)
-         }
-         break;
- 
-+    case VIR_DOMAIN_IOMMU_MODEL_AMD:
-+        if (iommu->caching_mode != VIR_TRISTATE_SWITCH_ABSENT ||
-+            iommu->eim != VIR_TRISTATE_SWITCH_ABSENT ||
-+            iommu->aw_bits != 0 ||
-+            iommu->dma_translation != VIR_TRISTATE_SWITCH_ABSENT) {
-+            virReportError(VIR_ERR_XML_ERROR,
-+                           _("iommu model '%1$s' doesn't support some additional attributes"),
-+                           virDomainIOMMUModelTypeToString(iommu->model));
-+            return -1;
-+        }
-+        break;
-+
-     case VIR_DOMAIN_IOMMU_MODEL_INTEL:
-     case VIR_DOMAIN_IOMMU_MODEL_LAST:
-         break;
-@@ -3003,6 +3015,7 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu)
-         break;
- 
-     case VIR_DOMAIN_IOMMU_MODEL_VIRTIO:
-+    case VIR_DOMAIN_IOMMU_MODEL_AMD:
-     case VIR_DOMAIN_IOMMU_MODEL_LAST:
-         break;
-     }
-diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index d46eb44588..38a0586f40 100644
---- a/src/conf/schemas/domaincommon.rng
-+++ b/src/conf/schemas/domaincommon.rng
-@@ -6174,6 +6174,7 @@
-           <value>intel</value>
-           <value>smmuv3</value>
-           <value>virtio</value>
-+          <value>amd</value>
-         </choice>
-       </attribute>
-       <interleave>
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index fb70c79a94..de535029a8 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6051,6 +6051,7 @@ qemuBuildIOMMUCommandLine(virCommand *cmd,
-                           virQEMUCaps *qemuCaps)
- {
-     g_autoptr(virJSONValue) props = NULL;
-+    g_autoptr(virJSONValue) wrapperProps = NULL;
-     const virDomainIOMMUDef *iommu = def->iommu;
- 
-     if (!iommu)
-@@ -6095,6 +6096,32 @@ qemuBuildIOMMUCommandLine(virCommand *cmd,
-         /* There is no -device for SMMUv3, so nothing to be done here */
-         return 0;
- 
-+    case VIR_DOMAIN_IOMMU_MODEL_AMD:
-+        if (virJSONValueObjectAdd(&wrapperProps,
-+                                  "s:driver", "AMDVI-PCI",
-+                                  "s:id", iommu->info.alias,
-+                                  NULL) < 0)
-+            return -1;
-+
-+        if (qemuBuildDeviceAddressProps(wrapperProps, def, &iommu->info) < 0)
-+            return -1;
-+
-+        if (qemuBuildDeviceCommandlineFromJSON(cmd, wrapperProps, def, qemuCaps) < 0)
-+            return -1;
-+
-+        if (virJSONValueObjectAdd(&props,
-+                                  "s:driver", "amd-iommu",
-+                                  "s:pci-id", iommu->info.alias,
-+                                  "S:intremap", qemuOnOffAuto(iommu->intremap),
-+                                  "T:device-iotlb", iommu->iotlb,
-+                                  NULL) < 0)
-+            return -1;
-+
-+        if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) < 0)
-+            return -1;
-+
-+        return 0;
-+
-     case VIR_DOMAIN_IOMMU_MODEL_LAST:
-     default:
-         virReportEnumRangeError(virDomainIOMMUModel, iommu->model);
-@@ -6921,6 +6948,7 @@ qemuBuildMachineCommandLine(virCommand *cmd,
- 
-         case VIR_DOMAIN_IOMMU_MODEL_INTEL:
-         case VIR_DOMAIN_IOMMU_MODEL_VIRTIO:
-+        case VIR_DOMAIN_IOMMU_MODEL_AMD:
-             /* These IOMMUs are formatted in qemuBuildIOMMUCommandLine */
-             break;
- 
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index b73ac9ebf1..d8ab5a03f7 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -941,6 +941,9 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
-             case VIR_DOMAIN_IOMMU_MODEL_VIRTIO:
-                 return virtioFlags | VIR_PCI_CONNECT_INTEGRATED;
- 
-+            case VIR_DOMAIN_IOMMU_MODEL_AMD:
-+                return pciFlags | VIR_PCI_CONNECT_INTEGRATED;
-+
-             case VIR_DOMAIN_IOMMU_MODEL_INTEL:
-             case VIR_DOMAIN_IOMMU_MODEL_SMMUV3:
-             case VIR_DOMAIN_IOMMU_MODEL_LAST:
-@@ -2359,6 +2362,7 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def,
- 
-         switch (iommu->model) {
-         case VIR_DOMAIN_IOMMU_MODEL_VIRTIO:
-+        case VIR_DOMAIN_IOMMU_MODEL_AMD:
-             if (virDeviceInfoPCIAddressIsWanted(&iommu->info) &&
-                 qemuDomainPCIAddressReserveNextAddr(addrs, &iommu->info) < 0) {
-                 return -1;
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index 97f8f58ffd..ddfb14399a 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -5153,6 +5153,28 @@ qemuValidateDomainDeviceDefIOMMU(const virDomainIOMMUDef *iommu,
-         }
-         break;
- 
-+    case VIR_DOMAIN_IOMMU_MODEL_AMD:
-+        if (!qemuDomainIsQ35(def)) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                           _("IOMMU device: '%1$s' is only supported with Q35 machines"),
-+                           virDomainIOMMUModelTypeToString(iommu->model));
-+            return -1;
-+        }
-+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AMD_IOMMU_PCI_ID)) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                           _("IOMMU device: '%1$s' is not supported with this QEMU binary"),
-+                           virDomainIOMMUModelTypeToString(iommu->model));
-+            return -1;
-+        }
-+        if (iommu->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
-+            iommu->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                           _("IOMMU device: '%1$s' needs a PCI address"),
-+                           virDomainIOMMUModelTypeToString(iommu->model));
-+            return -1;
-+        }
-+        break;
-+
-     case VIR_DOMAIN_IOMMU_MODEL_LAST:
-     default:
-         virReportEnumRangeError(virDomainIOMMUModel, iommu->model);
-diff --git a/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
-new file mode 100644
-index 0000000000..36244edb3a
---- /dev/null
-+++ b/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
-@@ -0,0 +1,35 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-+USER=test \
-+LOGNAME=test \
-+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-+/usr/bin/qemu-system-x86_64 \
-+-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 q35,usb=off,kernel_irqchip=split,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
-+-accel kvm \
-+-cpu qemu64 \
-+-m size=219136k \
-+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-+-overcommit mem-lock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot strict=on \
-+-device '{"driver":"AMDVI-PCI","id":"iommu0","bus":"pcie.0","addr":"0x1"}' \
-+-device '{"driver":"amd-iommu","pci-id":"iommu0","intremap":"on","device-iotlb":true}' \
-+-audiodev '{"id":"audio1","driver":"none"}' \
-+-global ICH9-LPC.noreboot=off \
-+-watchdog-action reset \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.xml b/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.xml
-new file mode 120000
-index 0000000000..5ba3d4b91b
---- /dev/null
-+++ b/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.xml
-@@ -0,0 +1 @@
-+amd-iommu.xml
-\ No newline at end of file
-diff --git a/tests/qemuxmlconfdata/amd-iommu.xml b/tests/qemuxmlconfdata/amd-iommu.xml
-new file mode 100644
-index 0000000000..0668ed4237
---- /dev/null
-+++ b/tests/qemuxmlconfdata/amd-iommu.xml
-@@ -0,0 +1,39 @@
-+<domain type='kvm'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219100</memory>
-+  <currentMemory unit='KiB'>219100</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='x86_64' machine='q35'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <features>
-+    <acpi/>
-+    <ioapic driver='qemu'/>
-+  </features>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='forbid'>qemu64</model>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <controller type='pci' index='0' model='pcie-root'/>
-+    <controller type='usb' index='0' model='none'/>
-+    <controller type='sata' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-+    </controller>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <audio id='1' type='none'/>
-+    <watchdog model='itco' action='reset'/>
-+    <memballoon model='none'/>
-+    <iommu model='amd'>
-+      <driver intremap='on' iotlb='on'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-+    </iommu>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index bed562286d..e59ed73088 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -2774,6 +2774,8 @@ mymain(void)
-     DO_TEST_CAPS_LATEST("acpi-table");
-     DO_TEST_CAPS_LATEST("acpi-table-many");
- 
-+    DO_TEST_CAPS_LATEST("amd-iommu");
-+
-     DO_TEST_CAPS_LATEST("intel-iommu");
-     DO_TEST_CAPS_LATEST("intel-iommu-caching-mode");
-     DO_TEST_CAPS_LATEST("intel-iommu-eim");
--- 
-2.50.1
diff --git a/SOURCES/libvirt-qemu-add-ability-to-set-TLS-priority-string-with-QEMU.patch b/SOURCES/libvirt-qemu-add-ability-to-set-TLS-priority-string-with-QEMU.patch
deleted file mode 100644
index eebae97..0000000
--- a/SOURCES/libvirt-qemu-add-ability-to-set-TLS-priority-string-with-QEMU.patch
+++ /dev/null
@@ -1,690 +0,0 @@
-From 40243a6838c8f22c2be519ff8347c03c730caf45 Mon Sep 17 00:00:00 2001
-Message-ID: <40243a6838c8f22c2be519ff8347c03c730caf45.1755522824.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 16 Jul 2025 16:40:01 +0100
-Subject: [PATCH] qemu: add ability to set TLS priority string with QEMU
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QEMU will either use the GNUTLS default priority string of "NORMAL",
-or on Fedora/RHEL related distros, "@QEMU,SYSTEM", which resolves to
-a configuration in /etc/crypto-policies/back-ends/gnutls.config.
-
-The latter gives the sysadmin the ability to change the priority
-string used for GNUTLS at deployment time, either system side, or
-exclusively for QEMU, avoiding the hardcoded GNUTLS defaults.
-
-There are still some limitations to this:
-
- * Priorities cannot be set for different areas of QEMU
-   functionality (migration, vnc, nbd, etc)
-
- * Priorities are fixed at the time when QEMU first
-   triggers GNUTLS to load its config file, often
-   immediately at startup.
-
-We recently uncovered a QEMU bug that causes crashes in live
-migration with TLS-1.3, where the easiest workaround is to
-change the TLS priorities. We can't change this on the running
-QEMU, but fortunately it is possible to change it on the target
-QEMU and the TLS handshake will make it take effect on both
-src and dst.
-
-The problem is, while fixing the immediate incoming and outgoing
-live migration problems, the workaround will apply to everything
-else that QEMU does for the rest of the time that process exists.
-
-We want to make it possible to set the TLS priorities only for
-the current migrations, such that if the target QEMU has a fixed
-GNUTLS, it will not have its TLS priorities hobbled for the next
-live migration.
-
-To achieve this we need libvirt to be able to (optionally) set
-the TLS priority string with QEMU. While live migration is the
-most pressing need, the new qemu.conf parameters are wired up
-for every subsystem for greater selectivity in future.
-
-With this we can activate the GNUTLS workaround for running
-QEMU processes by editting qemu.conf and restarting virtqemud,
-and later undo this the same way.
-
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 14e41ac9f365b148e69088c5ffeb565a0f9ba326)
-- Added dummy vxhsTLSpriority field and adapted old test data files
-
-Resolves: https://issues.redhat.com/browse/RHEL-106276
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/conf/storage_source_conf.c                |  2 +
- src/conf/storage_source_conf.h                |  1 +
- src/qemu/libvirtd_qemu.aug                    |  6 +++
- src/qemu/qemu.conf.in                         | 37 +++++++++++++++++++
- src/qemu/qemu_backup.c                        |  5 ++-
- src/qemu/qemu_blockjob.c                      |  1 +
- src/qemu/qemu_command.c                       | 15 ++++++--
- src/qemu/qemu_command.h                       |  1 +
- src/qemu/qemu_conf.c                          | 22 +++++++++++
- src/qemu/qemu_conf.h                          |  8 ++++
- src/qemu/qemu_domain.c                        |  3 ++
- src/qemu/qemu_domain.h                        |  1 +
- src/qemu/qemu_hotplug.c                       |  4 +-
- src/qemu/qemu_hotplug.h                       |  1 +
- src/qemu/qemu_migration_params.c              |  1 +
- src/qemu/test_libvirtd_qemu.aug.in            |  6 +++
- ...rk-tlsx509-nbd-hostname.x86_64-latest.args |  2 +-
- .../graphics-vnc-tls-secret.x86_64-5.2.0.args |  2 +-
- ...graphics-vnc-tls-secret.x86_64-latest.args |  2 +-
- ...-tlsx509-secret-chardev.x86_64-latest.args |  2 +-
- tests/qemuxmlconftest.c                       |  6 +++
- 21 files changed, 117 insertions(+), 11 deletions(-)
-
-diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c
-index ca956a1b7c..dc6e6bde32 100644
---- a/src/conf/storage_source_conf.c
-+++ b/src/conf/storage_source_conf.c
-@@ -838,6 +838,7 @@ virStorageSourceCopy(const virStorageSource *src,
-     def->compat = g_strdup(src->compat);
-     def->tlsAlias = g_strdup(src->tlsAlias);
-     def->tlsCertdir = g_strdup(src->tlsCertdir);
-+    def->tlsPriority = g_strdup(src->tlsPriority);
-     def->tlsHostname = g_strdup(src->tlsHostname);
-     def->query = g_strdup(src->query);
-     def->vdpadev = g_strdup(src->vdpadev);
-@@ -1191,6 +1192,7 @@ virStorageSourceClear(virStorageSource *def)
- 
-     VIR_FREE(def->tlsAlias);
-     VIR_FREE(def->tlsCertdir);
-+    VIR_FREE(def->tlsPriority);
-     VIR_FREE(def->tlsHostname);
- 
-     VIR_FREE(def->ssh_user);
-diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h
-index e6cbb93c06..760b60bd40 100644
---- a/src/conf/storage_source_conf.h
-+++ b/src/conf/storage_source_conf.h
-@@ -392,6 +392,7 @@ struct _virStorageSource {
-      * certificate directory with listen and verify bools. */
-     char *tlsAlias;
-     char *tlsCertdir;
-+    char *tlsPriority;
- 
-     /* TLS hostname override */
-     char *tlsHostname;
-diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
-index 3f018f39a0..711806b2a8 100644
---- a/src/qemu/libvirtd_qemu.aug
-+++ b/src/qemu/libvirtd_qemu.aug
-@@ -30,6 +30,7 @@ module Libvirtd_qemu =
-    let default_tls_entry = str_entry "default_tls_x509_cert_dir"
-                  | bool_entry "default_tls_x509_verify"
-                  | str_entry "default_tls_x509_secret_uuid"
-+                 | str_entry "default_tls_priority"
- 
-    let vnc_entry = str_entry "vnc_listen"
-                  | bool_entry "vnc_auto_unix_socket"
-@@ -37,6 +38,7 @@ module Libvirtd_qemu =
-                  | str_entry "vnc_tls_x509_cert_dir"
-                  | bool_entry "vnc_tls_x509_verify"
-                  | str_entry "vnc_tls_x509_secret_uuid"
-+                 | str_entry "vnc_tls_priority"
-                  | str_entry "vnc_password"
-                  | bool_entry "vnc_sasl"
-                  | str_entry "vnc_sasl_dir"
-@@ -54,15 +56,18 @@ module Libvirtd_qemu =
-                  | str_entry "chardev_tls_x509_cert_dir"
-                  | bool_entry "chardev_tls_x509_verify"
-                  | str_entry "chardev_tls_x509_secret_uuid"
-+                 | str_entry "chardev_tls_priority"
- 
-    let migrate_entry = str_entry "migrate_tls_x509_cert_dir"
-                  | bool_entry "migrate_tls_x509_verify"
-                  | str_entry "migrate_tls_x509_secret_uuid"
-+                 | str_entry "migrate_tls_priority"
-                  | bool_entry "migrate_tls_force"
- 
-    let backup_entry = str_entry "backup_tls_x509_cert_dir"
-                  | bool_entry "backup_tls_x509_verify"
-                  | str_entry "backup_tls_x509_secret_uuid"
-+                 | str_entry "backup_tls_priority"
- 
-    let vxhs_entry = bool_entry "vxhs_tls"
-                  | str_entry "vxhs_tls_x509_cert_dir"
-@@ -71,6 +76,7 @@ module Libvirtd_qemu =
-    let nbd_entry = bool_entry "nbd_tls"
-                  | str_entry "nbd_tls_x509_cert_dir"
-                  | str_entry "nbd_tls_x509_secret_uuid"
-+                 | str_entry "nbd_tls_priority"
- 
-    let nogfx_entry = bool_entry "nographics_allow_host_audio"
- 
-diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in
-index 988d176a28..8bf18d06b2 100644
---- a/src/qemu/qemu.conf.in
-+++ b/src/qemu/qemu.conf.in
-@@ -62,6 +62,18 @@
- #default_tls_x509_secret_uuid = "00000000-0000-0000-0000-000000000000"
- 
- 
-+# Libvirt allows QEMU to use its built-in TLS priority by default,
-+# however, this allows overriding it at runtime. This is especially
-+# useful if TLS priority needs to be changed for an operation run
-+# against an existing running QEMU.
-+#
-+# This must be a valid GNUTLS priority string:
-+#
-+#   https://gnutls.org/manual/html_node/Priority-Strings.html
-+#
-+#default_tls_priority = "@SYSTEM"
-+
-+
- # VNC is configured to listen on 127.0.0.1 by default.
- # To make it listen on all public interfaces, uncomment
- # this next option.
-@@ -127,6 +139,11 @@
- #vnc_tls_x509_secret_uuid = "00000000-0000-0000-0000-000000000000"
- 
- 
-+# Override QEMU default GNUTLS priority string for VNC
-+#
-+#vnc_tls_priority = "@SYSTEM"
-+
-+
- # The default VNC password. Only 8 bytes are significant for
- # VNC passwords. This parameter is only used if the per-domain
- # XML config does not already provide a password. To allow
-@@ -278,6 +295,11 @@
- #chardev_tls_x509_secret_uuid = "00000000-0000-0000-0000-000000000000"
- 
- 
-+# Override QEMU default GNUTLS priority string for character devices
-+#
-+#chardev_tls_priority = "@SYSTEM"
-+
-+
- # Enable use of TLS encryption for all VxHS network block devices that
- # don't specifically disable.
- #
-@@ -366,6 +388,11 @@
- #nbd_tls_x509_secret_uuid = "00000000-0000-0000-0000-000000000000"
- 
- 
-+# Override QEMU default GNUTLS priority string for NBD
-+#
-+#nbd_tls_priority = "@SYSTEM"
-+
-+
- # In order to override the default TLS certificate location for migration
- # certificates, supply a valid path to the certificate directory. If the
- # provided path does not exist, libvirtd will fail to start. If the path is
-@@ -405,6 +432,11 @@
- #migrate_tls_x509_secret_uuid = "00000000-0000-0000-0000-000000000000"
- 
- 
-+# Override QEMU default GNUTLS priority string for live migration
-+#
-+#migrate_tls_priority = "@SYSTEM"
-+
-+
- # By default TLS is requested using the VIR_MIGRATE_TLS flag, thus not requested
- # automatically. Setting 'migate_tls_force' to "1" will prevent any migration
- # which is not using VIR_MIGRATE_TLS to ensure higher level of security in
-@@ -450,6 +482,11 @@
- #backup_tls_x509_secret_uuid = "00000000-0000-0000-0000-000000000000"
- 
- 
-+# Override QEMU default GNUTLS priority string for NBD backups
-+#
-+#backup_tls_priority = "@SYSTEM"
-+
-+
- # By default, if no graphical front end is configured, libvirt will disable
- # QEMU audio output since directly talking to alsa/pulseaudio may not work
- # with various security settings. If you know what you're doing, enable
-diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
-index f64639d501..d416f0f0c7 100644
---- a/src/qemu/qemu_backup.c
-+++ b/src/qemu/qemu_backup.c
-@@ -725,8 +725,9 @@ qemuBackupBeginPrepareTLS(virDomainObj *vm,
-     }
- 
-     if (qemuBuildTLSx509BackendProps(cfg->backupTLSx509certdir, true,
--                                     cfg->backupTLSx509verify, tlsObjAlias,
--                                     tlsKeySecretAlias,
-+                                     cfg->backupTLSx509verify,
-+                                     cfg->backupTLSpriority,
-+                                     tlsObjAlias, tlsKeySecretAlias,
-                                      tlsProps) < 0)
-         return -1;
- 
-diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
-index 4e77543fa8..4d94703807 100644
---- a/src/qemu/qemu_blockjob.c
-+++ b/src/qemu/qemu_blockjob.c
-@@ -623,6 +623,7 @@ qemuBlockJobCleanStorageSourceRuntime(virStorageSource *src)
-     VIR_FREE(src->nodenameformat);
-     VIR_FREE(src->tlsAlias);
-     VIR_FREE(src->tlsCertdir);
-+    VIR_FREE(src->tlsPriority);
- }
- 
- 
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index fffc8be08a..243729800b 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -1253,6 +1253,7 @@ qemuBuildObjectSecretCommandLine(virCommand *cmd,
-  * @tlspath: path to the TLS credentials
-  * @listen: boolean listen for client or server setting
-  * @verifypeer: boolean to enable peer verification (form of authorization)
-+ * @priority: GNUTLS priority string override (optional)
-  * @alias: alias for the TLS credentials object
-  * @secalias: if one exists, the alias of the security object for passwordid
-  * @propsret: json properties to return
-@@ -1265,6 +1266,7 @@ int
- qemuBuildTLSx509BackendProps(const char *tlspath,
-                              bool isListen,
-                              bool verifypeer,
-+                             const char *priority,
-                              const char *alias,
-                              const char *secalias,
-                              virJSONValue **propsret)
-@@ -1273,6 +1275,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
-                                      "s:dir", tlspath,
-                                      "s:endpoint", (isListen ? "server": "client"),
-                                      "b:verify-peer", (isListen ? verifypeer : true),
-+                                     "S:priority", priority,
-                                      "S:passwordid", secalias,
-                                      NULL) < 0)
-         return -1;
-@@ -1286,6 +1289,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
-  * @tlspath: path to the TLS credentials
-  * @listen: boolean listen for client or server setting
-  * @verifypeer: boolean to enable peer verification (form of authorization)
-+ * @priority: GNUTLS priority string override (optional)
-  * @certEncSecretAlias: alias of a 'secret' object for decrypting TLS private key
-  *                      (optional)
-  * @alias: TLS object alias
-@@ -1300,14 +1304,15 @@ qemuBuildTLSx509CommandLine(virCommand *cmd,
-                             const char *tlspath,
-                             bool isListen,
-                             bool verifypeer,
-+                            const char *priority,
-                             const char *certEncSecretAlias,
-                             const char *alias,
-                             virQEMUCaps *qemuCaps)
- {
-     g_autoptr(virJSONValue) props = NULL;
- 
--    if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias,
--                                     certEncSecretAlias, &props) < 0)
-+    if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, priority,
-+                                     alias, certEncSecretAlias, &props) < 0)
-         return -1;
- 
-     if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0)
-@@ -1350,6 +1355,7 @@ qemuBuildChardevCommand(virCommand *cmd,
-             if (qemuBuildTLSx509CommandLine(cmd, chrSourcePriv->tlsCertPath,
-                                             dev->data.tcp.listen,
-                                             chrSourcePriv->tlsVerify,
-+                                            chrSourcePriv->tlsPriority,
-                                             tlsCertEncSecAlias,
-                                             objalias, qemuCaps) < 0) {
-                 return -1;
-@@ -8144,6 +8150,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg,
-                                         cfg->vncTLSx509certdir,
-                                         true,
-                                         cfg->vncTLSx509verify,
-+                                        cfg->vncTLSpriority,
-                                         secretAlias,
-                                         gfxPriv->tlsAlias,
-                                         qemuCaps) < 0)
-@@ -10995,8 +11002,8 @@ qemuBuildStorageSourceAttachPrepareCommon(virStorageSource *src,
-     }
- 
-     if (src->haveTLS == VIR_TRISTATE_BOOL_YES &&
--        qemuBuildTLSx509BackendProps(src->tlsCertdir, false, true, src->tlsAlias,
--                                     tlsKeySecretAlias, &data->tlsProps) < 0)
-+        qemuBuildTLSx509BackendProps(src->tlsCertdir, false, true, src->tlsPriority,
-+                                     src->tlsAlias, tlsKeySecretAlias, &data->tlsProps) < 0)
-         return -1;
- 
-     return 0;
-diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
-index 76c514b5f7..948a633668 100644
---- a/src/qemu/qemu_command.h
-+++ b/src/qemu/qemu_command.h
-@@ -62,6 +62,7 @@ int qemuBuildSecretInfoProps(qemuDomainSecretInfo *secinfo,
- int qemuBuildTLSx509BackendProps(const char *tlspath,
-                                  bool isListen,
-                                  bool verifypeer,
-+                                 const char *priority,
-                                  const char *alias,
-                                  const char *secalias,
-                                  virJSONValue **propsret);
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 7c15c521c7..93e1f7938b 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -422,6 +422,9 @@ virQEMUDriverConfigLoadDefaultTLSEntry(virQEMUDriverConfig *cfg,
-     if (virConfGetValueString(conf, "default_tls_x509_secret_uuid",
-                               &cfg->defaultTLSx509secretUUID) < 0)
-         return -1;
-+    if (virConfGetValueString(conf, "default_tls_priority",
-+                              &cfg->defaultTLSpriority) < 0)
-+        return -1;
- 
-     return 0;
- }
-@@ -521,6 +524,9 @@ virQEMUDriverConfigLoadSpecificTLSEntry(virQEMUDriverConfig *cfg,
-                                   #val "_tls_x509_secret_uuid", \
-                                   &cfg->val## TLSx509secretUUID) < 0) \
-             return -1; \
-+        if ((rv = virConfGetValueString(conf, #val "_tls_priority", \
-+                                        &cfg->val## TLSpriority)) < 0) \
-+            return -1; \
-     } while (0)
- 
- #define GET_CONFIG_TLS_CERTINFO_SERVER(val) \
-@@ -1305,6 +1311,22 @@ virQEMUDriverConfigSetDefaults(virQEMUDriverConfig *cfg)
- 
- #undef SET_TLS_SECRET_UUID_DEFAULT
- 
-+#define SET_TLS_PRIORITY_DEFAULT(val) \
-+    do { \
-+        if (!cfg->val## TLSpriority && \
-+            cfg->defaultTLSpriority) { \
-+            cfg->val## TLSpriority = g_strdup(cfg->defaultTLSpriority); \
-+        } \
-+    } while (0)
-+
-+    SET_TLS_PRIORITY_DEFAULT(vnc);
-+    SET_TLS_PRIORITY_DEFAULT(chardev);
-+    SET_TLS_PRIORITY_DEFAULT(migrate);
-+    SET_TLS_PRIORITY_DEFAULT(backup);
-+    SET_TLS_PRIORITY_DEFAULT(nbd);
-+
-+#undef SET_TLS_PRIORITY_DEFAULT
-+
-     /*
-      * If a "SYSCONFDIR" + "pki/libvirt-<val>" exists, then assume someone
-      * has created a val specific area to place service specific certificates.
-diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
-index 42cdb6f883..b650f52262 100644
---- a/src/qemu/qemu_conf.h
-+++ b/src/qemu/qemu_conf.h
-@@ -115,6 +115,7 @@ struct _virQEMUDriverConfig {
-     bool defaultTLSx509verify;
-     bool defaultTLSx509verifyPresent;
-     char *defaultTLSx509secretUUID;
-+    char *defaultTLSpriority;
- 
-     bool vncAutoUnixSocket;
-     bool vncTLS;
-@@ -123,6 +124,7 @@ struct _virQEMUDriverConfig {
-     bool vncSASL;
-     char *vncTLSx509certdir;
-     char *vncTLSx509secretUUID;
-+    char *vncTLSpriority;
-     char *vncListen;
-     char *vncPassword;
-     char *vncSASLdir;
-@@ -140,25 +142,31 @@ struct _virQEMUDriverConfig {
-     bool chardevTLSx509verify;
-     bool chardevTLSx509verifyPresent;
-     char *chardevTLSx509secretUUID;
-+    char *chardevTLSpriority;
- 
-     char *migrateTLSx509certdir;
-     bool migrateTLSx509verify;
-     bool migrateTLSx509verifyPresent;
-     char *migrateTLSx509secretUUID;
-+    char *migrateTLSpriority;
-     bool migrateTLSForce;
- 
-     char *backupTLSx509certdir;
-     bool backupTLSx509verify;
-     bool backupTLSx509verifyPresent;
-     char *backupTLSx509secretUUID;
-+    char *backupTLSpriority;
- 
-     bool vxhsTLS;
-     char *vxhsTLSx509certdir;
-     char *vxhsTLSx509secretUUID;
-+    char *vxhsTLSpriority; /* unused / dummy field to keep
-+                            * GET_CONFIG_TLS_CERTINFO_COMMON happy */
- 
-     bool nbdTLS;
-     char *nbdTLSx509certdir;
-     char *nbdTLSx509secretUUID;
-+    char *nbdTLSpriority;
- 
-     unsigned int remotePortMin;
-     unsigned int remotePortMax;
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index cc47adb724..8879a45ffb 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -955,6 +955,7 @@ qemuDomainChrSourcePrivateDispose(void *obj)
-     qemuDomainChrSourcePrivateClearFDPass(priv);
- 
-     g_free(priv->tlsCertPath);
-+    g_free(priv->tlsPriority);
- 
-     g_free(priv->tlsCredsAlias);
- 
-@@ -8686,6 +8687,7 @@ qemuDomainPrepareChardevSourceOne(virDomainDeviceDef *dev,
- 
-             if (charsrc->data.tcp.haveTLS == VIR_TRISTATE_BOOL_YES) {
-                 charpriv->tlsCertPath = g_strdup(data->cfg->chardevTLSx509certdir);
-+                charpriv->tlsPriority = g_strdup(data->cfg->chardevTLSpriority);
-                 charpriv->tlsVerify = data->cfg->chardevTLSx509verify;
-             }
-         }
-@@ -8785,6 +8787,7 @@ qemuProcessPrepareStorageSourceTLSNBD(virStorageSource *src,
- 
-         src->tlsAlias = qemuAliasTLSObjFromSrcAlias(parentAlias);
-         src->tlsCertdir = g_strdup(cfg->nbdTLSx509certdir);
-+        src->tlsPriority = g_strdup(cfg->nbdTLSpriority);
- 
-         if (cfg->nbdTLSx509secretUUID) {
-             qemuDomainStorageSourcePrivate *srcpriv = qemuDomainStorageSourcePrivateFetch(src);
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index 63f422bbcb..3f16f86da8 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -381,6 +381,7 @@ struct _qemuDomainChrSourcePrivate {
- 
-     char *tlsCertPath; /* path to certificates if TLS is requested */
-     bool tlsVerify; /* whether server should verify client certificates */
-+    char *tlsPriority; /* optional GNUTLS priority string */
- 
-     char *tlsCredsAlias; /* alias of the x509 tls credentials object */
- };
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index ff09b58bfe..c6704cbebe 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -1717,6 +1717,7 @@ qemuDomainGetTLSObjects(qemuDomainSecretInfo *secinfo,
-                         const char *tlsCertdir,
-                         bool tlsListen,
-                         bool tlsVerify,
-+                        const char *tlsPriority,
-                         const char *alias,
-                         virJSONValue **tlsProps,
-                         virJSONValue **secProps)
-@@ -1730,7 +1731,7 @@ qemuDomainGetTLSObjects(qemuDomainSecretInfo *secinfo,
-         secAlias = secinfo->alias;
-     }
- 
--    if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify,
-+    if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify, tlsPriority,
-                                      alias, secAlias, tlsProps) < 0)
-         return -1;
- 
-@@ -1774,6 +1775,7 @@ qemuDomainAddChardevTLSObjects(virQEMUDriver *driver,
-                                 cfg->chardevTLSx509certdir,
-                                 dev->data.tcp.listen,
-                                 cfg->chardevTLSx509verify,
-+                                cfg->chardevTLSpriority,
-                                 *tlsAlias, &tlsProps, &secProps) < 0)
-         return -1;
- 
-diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
-index 4fe7f4923e..5d32487047 100644
---- a/src/qemu/qemu_hotplug.h
-+++ b/src/qemu/qemu_hotplug.h
-@@ -38,6 +38,7 @@ int qemuDomainGetTLSObjects(qemuDomainSecretInfo *secinfo,
-                             const char *tlsCertdir,
-                             bool tlsListen,
-                             bool tlsVerify,
-+                            const char *tlsPriority,
-                             const char *alias,
-                             virJSONValue **tlsProps,
-                             virJSONValue **secProps);
-diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
-index 98822012cc..3858cca907 100644
---- a/src/qemu/qemu_migration_params.c
-+++ b/src/qemu/qemu_migration_params.c
-@@ -1143,6 +1143,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriver *driver,
-     if (qemuDomainGetTLSObjects(priv->migSecinfo,
-                                 cfg->migrateTLSx509certdir, tlsListen,
-                                 cfg->migrateTLSx509verify,
-+                                cfg->migrateTLSpriority,
-                                 *tlsAlias, &tlsProps, &secProps) < 0)
-         return -1;
- 
-diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
-index 86b3844d2c..b916af35ee 100644
---- a/src/qemu/test_libvirtd_qemu.aug.in
-+++ b/src/qemu/test_libvirtd_qemu.aug.in
-@@ -5,12 +5,14 @@ module Test_libvirtd_qemu =
- { "default_tls_x509_cert_dir" = "/etc/pki/qemu" }
- { "default_tls_x509_verify" = "1" }
- { "default_tls_x509_secret_uuid" = "00000000-0000-0000-0000-000000000000" }
-+{ "default_tls_priority" = "@SYSTEM" }
- { "vnc_listen" = "0.0.0.0" }
- { "vnc_auto_unix_socket" = "1" }
- { "vnc_tls" = "1" }
- { "vnc_tls_x509_cert_dir" = "/etc/pki/libvirt-vnc" }
- { "vnc_tls_x509_verify" = "1" }
- { "vnc_tls_x509_secret_uuid" = "00000000-0000-0000-0000-000000000000" }
-+{ "vnc_tls_priority" = "@SYSTEM" }
- { "vnc_password" = "XYZ12345" }
- { "vnc_sasl" = "1" }
- { "vnc_sasl_dir" = "/some/directory/sasl2" }
-@@ -26,19 +28,23 @@ module Test_libvirtd_qemu =
- { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
- { "chardev_tls_x509_verify" = "1" }
- { "chardev_tls_x509_secret_uuid" = "00000000-0000-0000-0000-000000000000" }
-+{ "chardev_tls_priority" = "@SYSTEM" }
- { "vxhs_tls" = "1" }
- { "vxhs_tls_x509_cert_dir" = "/etc/pki/libvirt-vxhs" }
- { "vxhs_tls_x509_secret_uuid" = "00000000-0000-0000-0000-000000000000" }
- { "nbd_tls" = "1" }
- { "nbd_tls_x509_cert_dir" = "/etc/pki/libvirt-nbd" }
- { "nbd_tls_x509_secret_uuid" = "00000000-0000-0000-0000-000000000000" }
-+{ "nbd_tls_priority" = "@SYSTEM" }
- { "migrate_tls_x509_cert_dir" = "/etc/pki/libvirt-migrate" }
- { "migrate_tls_x509_verify" = "1" }
- { "migrate_tls_x509_secret_uuid" = "00000000-0000-0000-0000-000000000000" }
-+{ "migrate_tls_priority" = "@SYSTEM" }
- { "migrate_tls_force" = "0" }
- { "backup_tls_x509_cert_dir" = "/etc/pki/libvirt-backup" }
- { "backup_tls_x509_verify" = "1" }
- { "backup_tls_x509_secret_uuid" = "00000000-0000-0000-0000-000000000000" }
-+{ "backup_tls_priority" = "@SYSTEM" }
- { "nographics_allow_host_audio" = "1" }
- { "remote_display_port_min" = "5900" }
- { "remote_display_port_max" = "65535" }
-diff --git a/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args
-index 4ee9a0631b..77d38c3020 100644
---- a/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args
-@@ -28,7 +28,7 @@ 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"}' \
- -object '{"qom-type":"secret","id":"objlibvirt-1-storage_tls0-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' \
---object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0","dir":"/etc/pki/libvirt-nbd","endpoint":"client","verify-peer":true,"passwordid":"objlibvirt-1-storage_tls0-secret0"}' \
-+-object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0","dir":"/etc/pki/libvirt-nbd","endpoint":"client","verify-peer":true,"priority":"@SYSTEM:-VERS-TLS1.3","passwordid":"objlibvirt-1-storage_tls0-secret0"}' \
- -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com","port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0","tls-hostname":"test-hostname","node-name":"libvirt-1-storage","read-only":false,"cache":{"direct":true,"no-flush":false}}' \
- -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-1-storage","id":"virtio-disk3","bootindex":1,"write-cache":"on"}' \
- -audiodev '{"id":"audio1","driver":"none"}' \
-diff --git a/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
-index 11f8b3f4f0..3c3002dd4f 100644
---- a/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
-+++ b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
-@@ -30,7 +30,7 @@ SASL_CONF_PATH=/etc/sasl2 \
- -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
- -audiodev '{"id":"audio1","driver":"none"}' \
- -object secret,id=vnc-tls-creds0-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
---object tls-creds-x509,id=vnc-tls-creds0,dir=/etc/pki/libvirt-vnc,endpoint=server,verify-peer=on,passwordid=vnc-tls-creds0-secret0 \
-+-object tls-creds-x509,id=vnc-tls-creds0,dir=/etc/pki/libvirt-vnc,endpoint=server,verify-peer=on,priority=@SYSTEM:-VERS-TLS1.3,passwordid=vnc-tls-creds0-secret0 \
- -vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,sasl=on,audiodev=audio1 \
- -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
- -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-diff --git a/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args
-index 50cc8532d1..32d7be1d3b 100644
---- a/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args
-@@ -29,7 +29,7 @@ SASL_CONF_PATH=/etc/sasl2 \
- -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
- -audiodev '{"id":"audio1","driver":"none"}' \
- -object '{"qom-type":"secret","id":"vnc-tls-creds0-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' \
---object '{"qom-type":"tls-creds-x509","id":"vnc-tls-creds0","dir":"/etc/pki/libvirt-vnc","endpoint":"server","verify-peer":true,"passwordid":"vnc-tls-creds0-secret0"}' \
-+-object '{"qom-type":"tls-creds-x509","id":"vnc-tls-creds0","dir":"/etc/pki/libvirt-vnc","endpoint":"server","verify-peer":true,"priority":"@SYSTEM:-VERS-TLS1.3","passwordid":"vnc-tls-creds0-secret0"}' \
- -vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,sasl=on,audiodev=audio1 \
- -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \
- -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-diff --git a/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args
-index c227a04112..492d1be626 100644
---- a/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args
-@@ -32,7 +32,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
- -chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111 \
- -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
- -object '{"qom-type":"secret","id":"charserial1-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' \
---object '{"qom-type":"tls-creds-x509","id":"objcharserial1_tls0","dir":"/etc/pki/libvirt-chardev","endpoint":"client","verify-peer":true,"passwordid":"charserial1-secret0"}' \
-+-object '{"qom-type":"tls-creds-x509","id":"objcharserial1_tls0","dir":"/etc/pki/libvirt-chardev","endpoint":"client","verify-peer":true,"priority":"@SYSTEM:-VERS-TLS1.3","passwordid":"charserial1-secret0"}' \
- -chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
- -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","index":1}' \
- -audiodev '{"id":"audio1","driver":"none"}' \
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index e59ed73088..a0af6429d1 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -1598,7 +1598,9 @@ mymain(void)
-     DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0");
-     DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd");
-     DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-tlsx509-nbd-hostname", "6.2.0");
-+    driver.config->nbdTLSpriority = g_strdup("@SYSTEM:-VERS-TLS1.3");
-     DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
-+    VIR_FREE(driver.config->nbdTLSpriority);
-     DO_TEST_CAPS_LATEST("disk-network-http");
-     VIR_FREE(driver.config->nbdTLSx509secretUUID);
-     VIR_FREE(driver.config->vxhsTLSx509secretUUID);
-@@ -1714,9 +1716,11 @@ mymain(void)
-     driver.config->vncTLS = 1;
-     driver.config->vncTLSx509verify = 1;
-     DO_TEST_CAPS_LATEST("graphics-vnc-tls");
-+    driver.config->vncTLSpriority = g_strdup("@SYSTEM:-VERS-TLS1.3");
-     driver.config->vncTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
-     DO_TEST_CAPS_VER("graphics-vnc-tls-secret", "5.2.0");
-     DO_TEST_CAPS_LATEST("graphics-vnc-tls-secret");
-+    VIR_FREE(driver.config->vncTLSpriority);
-     VIR_FREE(driver.config->vncTLSx509secretUUID);
-     driver.config->vncSASL = driver.config->vncTLSx509verify = driver.config->vncTLS = 0;
-     DO_TEST_CAPS_LATEST("graphics-vnc-egl-headless");
-@@ -1865,7 +1869,9 @@ mymain(void)
-     driver.config->chardevTLSx509verify = 0;
-     DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-notls");
-     driver.config->chardevTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
-+    driver.config->chardevTLSpriority = g_strdup("@SYSTEM:-VERS-TLS1.3");
-     DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-secret-chardev");
-+    VIR_FREE(driver.config->chardevTLSpriority);
-     VIR_FREE(driver.config->chardevTLSx509secretUUID);
-     driver.config->chardevTLS = 0;
-     DO_TEST_CAPS_LATEST("serial-many-chardev");
--- 
-2.50.1
diff --git a/SOURCES/libvirt-qemu-allow-migration-of-guest-with-mdev-vGPU-to-VF-vGPU.patch b/SOURCES/libvirt-qemu-allow-migration-of-guest-with-mdev-vGPU-to-VF-vGPU.patch
deleted file mode 100644
index b1c85f4..0000000
--- a/SOURCES/libvirt-qemu-allow-migration-of-guest-with-mdev-vGPU-to-VF-vGPU.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 1a54514bba90d0541efaf3e905ab30205c6014bd Mon Sep 17 00:00:00 2001
-Message-ID: <1a54514bba90d0541efaf3e905ab30205c6014bd.1737731143.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 13 Dec 2024 12:47:39 -0500
-Subject: [PATCH] qemu: allow migration of guest with mdev vGPU to VF vGPU
-
-GPU vendors are moving away from using mdev to create virtual GPUs
-towards using SRIOV VFs that are vGPUs. In both cases, once created
-the vGPUs are assigned to guests via <hostdev> (i.e. VFIO device
-assignment), and inside the guest the devices look identical, but mdev
-vGPUs are located by QEMU/VFIO using a uuid, while VF vGPUs are
-located with a PCI address. So although we generally require the
-device on the source host to exactly match the device on the
-destination host, in the case of mdev-created vGPU vs. VF vGPU
-migration *can* potentially work, except that libvirt has a hard-coded
-check that prevents us from even trying.
-
-This patch loosens up that check so that we will allow attempts to
-migrate a guest from a source host that has mdev-created vGPUs to a
-destination host that has VF vGPUs (and vice versa). The expectation
-is that if this doesn't actually work then QEMU will fail and generate
-an error that we can report.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Tested-by: Zhiyi Guo <zhguo@redhat.com>
-Reviewed-by: Zhiyi Guo <zhguo@redhat.com>
-(cherry picked from commit dd82e2baa84eed485fa0554eafd2bdc06a094081)
-
-https://issues.redhat.com/browse/RHEL-68064
-
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/conf/domain_conf.c | 28 +++++++++++++++++++++-------
- 1 file changed, 21 insertions(+), 7 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 1f0b67ca28..d3f30b08dc 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -20671,13 +20671,27 @@ virDomainHostdevDefCheckABIStability(virDomainHostdevDef *src,
-         return false;
-     }
- 
--    if (src->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
--        src->source.subsys.type != dst->source.subsys.type) {
--        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--                       _("Target host device subsystem %1$s does not match source %2$s"),
--                       virDomainHostdevSubsysTypeToString(dst->source.subsys.type),
--                       virDomainHostdevSubsysTypeToString(src->source.subsys.type));
--        return false;
-+    if (src->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
-+        virDomainHostdevSubsysType srcType = src->source.subsys.type;
-+        virDomainHostdevSubsysType dstType = dst->source.subsys.type;
-+
-+        /* If the source and destination subsys types aren't the same,
-+         * then migration can't be supported, *except* that it might
-+         * be supported to migrate from subsys type 'pci' to 'mdev'
-+         * and vice versa. (libvirt can't know for certain whether or
-+         * not it will actually work, so we have to just allow it and
-+         * count on QEMU to provide us with an error if it fails)
-+         */
-+
-+        if (srcType != dstType
-+            && ((srcType != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && srcType != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV)
-+                || (dstType != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && dstType != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV))) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                           _("Target host device subsystem type %1$s is not compatible with source subsystem type %2$s"),
-+                           virDomainHostdevSubsysTypeToString(dstType),
-+                           virDomainHostdevSubsysTypeToString(srcType));
-+            return false;
-+        }
-     }
- 
-     if (!virDomainDeviceInfoCheckABIStability(src->info, dst->info))
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-automatically-set-model-type-virtio-for-interface-type-vhostuser.patch b/SOURCES/libvirt-qemu-automatically-set-model-type-virtio-for-interface-type-vhostuser.patch
deleted file mode 100644
index ae06fa9..0000000
--- a/SOURCES/libvirt-qemu-automatically-set-model-type-virtio-for-interface-type-vhostuser.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e0e1ea834898b77afece7fec6463b6bc74b943d9 Mon Sep 17 00:00:00 2001
-Message-ID: <e0e1ea834898b77afece7fec6463b6bc74b943d9.1739824249.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Sun, 9 Feb 2025 18:23:03 -0500
-Subject: [PATCH] qemu: automatically set model type='virtio' for interface
- type='vhostuser'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Both vdpa and vhostuser require that the guest device be virtio, and
-for interface type='vdpa', we already set <model type='virtio'/> if it
-is unspecified in the input XML, so let's be just as courteous for
-interface type='vhostuser'.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c4746418d7e952888c0989db3a5c723d888fc32d)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/qemu/qemu_postparse.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c
-index 049a6ef2dc..892330646a 100644
---- a/src/qemu/qemu_postparse.c
-+++ b/src/qemu/qemu_postparse.c
-@@ -100,7 +100,8 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDef *net,
-                                 const virDomainDef *def,
-                                 virQEMUCaps *qemuCaps)
- {
--    if (net->type == VIR_DOMAIN_NET_TYPE_VDPA &&
-+    if ((net->type == VIR_DOMAIN_NET_TYPE_VDPA ||
-+         net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER) &&
-         !virDomainNetGetModelString(net)) {
-         net->model = VIR_DOMAIN_NET_MODEL_VIRTIO;
-     } else if (net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-capabilies-Introduce-QEMU_CAPS_BLOCKDEV_SET_ACTIVE.patch b/SOURCES/libvirt-qemu-capabilies-Introduce-QEMU_CAPS_BLOCKDEV_SET_ACTIVE.patch
deleted file mode 100644
index a7c8d06..0000000
--- a/SOURCES/libvirt-qemu-capabilies-Introduce-QEMU_CAPS_BLOCKDEV_SET_ACTIVE.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 8f41d0f749cd8b9944c32791cdfd3f3f7f806579 Mon Sep 17 00:00:00 2001
-Message-ID: <8f41d0f749cd8b9944c32791cdfd3f3f7f806579.1739824249.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 10 Feb 2025 17:57:01 +0100
-Subject: [PATCH] qemu: capabilies: Introduce QEMU_CAPS_BLOCKDEV_SET_ACTIVE
-
-The flag signals presence of the 'blockdev-set-active' QMP command.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit b402e167b640bcd242ba518cfd7cbc469dba52e9)
-
- Conflicts:
-	src/qemu/qemu_capabilities.c
-	src/qemu/qemu_capabilities.h
-	tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-
-         Some capabilities were not backported:
-            - QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRECATED_PROPS
-            - QEMU_CAPS_MIGRATE_INCOMING_EXIT_ON_ERROR
-            - QEMU_CAPS_MACHINE_VIRT_AIA
-            - QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW
-
-https://issues.redhat.com/browse/RHEL-79095
----
- src/qemu/qemu_capabilities.c                      | 2 ++
- src/qemu/qemu_capabilities.h                      | 1 +
- tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 +
- 3 files changed, 4 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index dec3199fce..65e19965dd 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -721,6 +721,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               "chardev-reconnect-miliseconds", /* QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS */
-               "virtio-ccw.loadparm", /* QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM */
-               "netdev-stream-reconnect-miliseconds", /* QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS */
-+              "blockdev-set-active", /* QEMU_CAPS_BLOCKDEV_SET_ACTIVE */
-     );
- 
- 
-@@ -1242,6 +1243,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
-     { "query-stats-schemas", QEMU_CAPS_QUERY_STATS_SCHEMAS },
-     { "display-reload", QEMU_CAPS_DISPLAY_RELOAD },
-     { "snapshot-save", QEMU_CAPS_SNAPSHOT_INTERNAL_QMP },
-+    { "blockdev-set-active", QEMU_CAPS_BLOCKDEV_SET_ACTIVE },
- };
- 
- struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 48e4530c95..e93e6a01cc 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -700,6 +700,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS, /* 'reconnect-ms' option for chardevs supported */
-     QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM, /* loadparm available on CCW device for multi device boot */
-     QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS, /* 'reconnect-ms' option for netdev stream supported */
-+    QEMU_CAPS_BLOCKDEV_SET_ACTIVE, /* blockdev-set-active QMP command supported */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-index aed0a58fa7..e09b6e6e1a 100644
---- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-@@ -210,6 +210,7 @@
-   <flag name='snapshot-internal-qmp'/>
-   <flag name='chardev-reconnect-miliseconds'/>
-   <flag name='netdev-stream-reconnect-miliseconds'/>
-+  <flag name='blockdev-set-active'/>
-   <version>9002050</version>
-   <microcodeVersion>43100285</microcodeVersion>
-   <package>v9.2.0-1636-gffaf7f0376</package>
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-capabilities-Introduce-QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR.patch b/SOURCES/libvirt-qemu-capabilities-Introduce-QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR.patch
new file mode 100644
index 0000000..5874c29
--- /dev/null
+++ b/SOURCES/libvirt-qemu-capabilities-Introduce-QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR.patch
@@ -0,0 +1,58 @@
+From d774dcd5a64a14a044ed801103b203bc54b8ac7a Mon Sep 17 00:00:00 2001
+Message-ID: <d774dcd5a64a14a044ed801103b203bc54b8ac7a.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 11 Dec 2025 19:26:40 +0100
+Subject: [PATCH] qemu: capabilities: Introduce
+ QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR
+
+Introduce capability for persisten migration control support.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit b0edb7eb9b819e0560bb7d65b4e0c89082b3b43b)
+
+https://issues.redhat.com/browse/RHEL-140614 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-135115 [rhel-10.2]
+
+Conflicts:
+ - Commit befdd44bf836c3ba46e46d57b587127e12736591 adding
+   QEMU_CAPS_VIRTIO_IOMMU_AW_BITS was not backported
+---
+ src/qemu/qemu_capabilities.c | 2 ++
+ src/qemu/qemu_capabilities.h | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 1efb77d03b..2c8bd62c99 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -755,6 +755,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               "disk-timed-stats", /* QEMU_CAPS_DISK_TIMED_STATS */
+               "query-accelerators", /* QEMU_CAPS_QUERY_ACCELERATORS */
+               "mshv", /* QEMU_CAPS_MSHV */
++              "scsi-block.migrate-pr", /* QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR */
+     );
+ 
+ 
+@@ -1536,6 +1537,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = {
+ };
+ 
+ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIBlock[] = {
++    { "migrate-pr", QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR, NULL },
+ };
+ 
+ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIGeneric[] = {
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index f180844e66..0c76f2edda 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -730,6 +730,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     QEMU_CAPS_DISK_TIMED_STATS, /* timed stats support ('stats-intervals' property of disk frontends) */
+     QEMU_CAPS_QUERY_ACCELERATORS, /* query-accelerators command */
+     QEMU_CAPS_MSHV, /* -accel mshv */
++    QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR, /* persistent reservation migration support */
+ 
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-capabilities-Probe-properties-of-scsi-block-and-scsi-generic-devices.patch b/SOURCES/libvirt-qemu-capabilities-Probe-properties-of-scsi-block-and-scsi-generic-devices.patch
new file mode 100644
index 0000000..c9b7e05
--- /dev/null
+++ b/SOURCES/libvirt-qemu-capabilities-Probe-properties-of-scsi-block-and-scsi-generic-devices.patch
@@ -0,0 +1,7714 @@
+From 3843fbb3a0bc346359c59f5d303ed51e19195208 Mon Sep 17 00:00:00 2001
+Message-ID: <3843fbb3a0bc346359c59f5d303ed51e19195208.1771336750.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 11 Dec 2025 18:43:39 +0100
+Subject: [PATCH] qemu: capabilities: Probe properties of 'scsi-block' and
+ 'scsi-generic' devices
+
+Add code to probe properties of 'scsi-block' and 'scsi-generic' qemu
+devices. For now the '.replies' are modified using the
+'qemu-replies-tool' script and the data is annotated as fake and is in
+fact missing. Further updates will populate them for any real dump.
+
+The properties for the two devices will be later used e.g. to detect
+support for persistent reservations migration support.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit d917bf662b65099472b15c5a1fa1493a5f4cdd14)
+
+https://issues.redhat.com/browse/RHEL-140614 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-135115 [rhel-10.2]
+
+Conflicts:
+ - Some capability output files don't exist upstream.
+---
+ src/qemu/qemu_capabilities.c                  | 12 +++
+ .../caps_10.0.0_aarch64.replies               | 76 +++++++++++-----
+ .../caps_10.0.0_ppc64.replies                 | 60 ++++++++++---
+ .../caps_10.0.0_s390x.replies                 | 64 ++++++++++----
+ .../caps_10.0.0_x86_64+amdsev.replies         | 84 ++++++++++++------
+ .../caps_10.0.0_x86_64.replies                | 84 ++++++++++++------
+ .../caps_10.1.0_x86_64+inteltdx.replies       | 88 +++++++++++++------
+ .../caps_10.1.0_x86_64.replies                | 88 +++++++++++++------
+ .../caps_10.2.0_x86_64+mshv.replies           | 88 +++++++++++++------
+ .../caps_10.2.0_x86_64.replies                | 88 +++++++++++++------
+ .../caps_6.2.0_ppc64.replies                  | 60 ++++++++++---
+ .../caps_6.2.0_x86_64.replies                 | 84 ++++++++++++------
+ .../caps_7.0.0_ppc64.replies                  | 60 ++++++++++---
+ .../caps_7.0.0_x86_64.replies                 | 84 ++++++++++++------
+ .../caps_7.1.0_ppc64.replies                  | 60 ++++++++++---
+ .../caps_7.1.0_x86_64.replies                 | 84 ++++++++++++------
+ .../caps_7.2.0_ppc.replies                    | 56 +++++++++---
+ .../caps_7.2.0_x86_64+hvf.replies             | 84 ++++++++++++------
+ .../caps_7.2.0_x86_64.replies                 | 84 ++++++++++++------
+ .../caps_8.0.0_x86_64.replies                 | 84 ++++++++++++------
+ .../caps_8.1.0_s390x.replies                  | 60 ++++++++++---
+ .../caps_8.1.0_x86_64.replies                 | 84 ++++++++++++------
+ .../caps_8.2.0_aarch64.replies                | 76 +++++++++++-----
+ .../caps_8.2.0_armv7l.replies                 | 76 +++++++++++-----
+ .../caps_8.2.0_loongarch64.replies            | 64 ++++++++++----
+ .../caps_8.2.0_s390x.replies                  | 60 ++++++++++---
+ .../caps_8.2.0_x86_64.replies                 | 84 ++++++++++++------
+ .../caps_9.0.0_sparc.replies                  | 52 ++++++++---
+ .../caps_9.0.0_x86_64.replies                 | 84 ++++++++++++------
+ .../caps_9.1.0_riscv64.replies                | 64 ++++++++++----
+ .../caps_9.1.0_s390x.replies                  | 64 ++++++++++----
+ .../caps_9.1.0_x86_64.replies                 | 84 ++++++++++++------
+ .../caps_9.2.0_aarch64+hvf.replies            | 72 ++++++++++-----
+ .../caps_9.2.0_s390x.replies                  | 64 ++++++++++----
+ .../caps_9.2.0_x86_64+amdsev.replies          | 84 ++++++++++++------
+ .../caps_9.2.0_x86_64.replies                 | 84 ++++++++++++------
+ 36 files changed, 1880 insertions(+), 748 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index d738805ee8..1efb77d03b 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -1535,6 +1535,12 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = {
+     { "stats-intervals", QEMU_CAPS_DISK_TIMED_STATS, NULL },
+ };
+ 
++static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIBlock[] = {
++};
++
++static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIGeneric[] = {
++};
++
+ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[] = {
+     { "stats-intervals", QEMU_CAPS_DISK_TIMED_STATS, NULL },
+ };
+@@ -1779,6 +1785,12 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = {
+     { "amd-iommu", virQEMUCapsDevicePropsAMDIOMMU,
+       G_N_ELEMENTS(virQEMUCapsDevicePropsAMDIOMMU),
+       QEMU_CAPS_AMD_IOMMU },
++    { "scsi-block", virQEMUCapsDevicePropsSCSIBlock,
++      G_N_ELEMENTS(virQEMUCapsDevicePropsSCSIBlock),
++      -1 },
++    { "scsi-generic", virQEMUCapsDevicePropsSCSIGeneric,
++      G_N_ELEMENTS(virQEMUCapsDevicePropsSCSIGeneric),
++      -1 },
+ };
+ 
+ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] = {
+diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies
+index f3d7ee69c1..0448dcaab9 100644
+--- a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies
++++ b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies
+@@ -32064,12 +32064,44 @@
+   "id": "libvirt-30"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-32"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -32159,7 +32191,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -32167,7 +32199,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -32246,7 +32278,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -32254,7 +32286,7 @@
+   "arguments": {
+     "typename": "max-arm-cpu"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -32502,12 +32534,12 @@
+       "type": "link<irq>"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -33602,7 +33634,7 @@
+       "default-ram-id": "ram"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -33610,7 +33642,7 @@
+   "arguments": {
+     "typename": "virt-10.0-machine"
+   },
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -33857,7 +33889,7 @@
+       "type": "string"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -33865,7 +33897,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -33984,12 +34016,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -34283,12 +34315,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -35755,12 +35787,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-gic-capabilities",
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -35776,7 +35808,7 @@
+       "kernel": false
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -35787,7 +35819,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35820,7 +35852,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35835,11 +35867,11 @@
+       }
+     }
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+-  "id": "libvirt-41",
++  "id": "libvirt-43",
+   "error": {
+     "class": "GenericError",
+     "desc": "Parameter 'model.props.hv-passthrough' is unexpected"
+diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies
+index 76d0b6fb6f..4833e479ad 100644
+--- a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies
++++ b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies
+@@ -31668,12 +31668,44 @@
+   "id": "libvirt-31"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-33"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-33"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -31767,7 +31799,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -31775,7 +31807,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -31854,12 +31886,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -32198,7 +32230,7 @@
+       "default-ram-id": "ppc_spapr.ram"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -32206,7 +32238,7 @@
+   "arguments": {
+     "typename": "pseries-10.0-machine"
+   },
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -32469,7 +32501,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -32477,7 +32509,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -32596,12 +32628,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -35133,12 +35165,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -36500,7 +36532,7 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
+index 52068141f9..ecd9af85ce 100644
+--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
++++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
+@@ -30530,12 +30530,44 @@
+   "id": "libvirt-32"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-33"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-33"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-34"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-34"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -30625,7 +30657,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -30633,7 +30665,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -30712,12 +30744,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -30992,7 +31024,7 @@
+       "default-ram-id": "s390.ram"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -31000,7 +31032,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -31119,12 +31151,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -31834,12 +31866,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -33117,7 +33149,7 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -33128,7 +33160,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -33200,7 +33232,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -33211,7 +33243,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -33367,7 +33399,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies
+index d49f1c3548..b228f9fd25 100644
+--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies
++++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies
+@@ -32202,12 +32202,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32297,7 +32329,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32305,7 +32337,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -32384,7 +32416,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -32392,7 +32424,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -34565,12 +34597,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35226,7 +35258,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35234,7 +35266,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -35353,7 +35385,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -35361,7 +35393,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -35568,12 +35600,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -37350,12 +37382,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -38878,12 +38910,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -38894,16 +38926,16 @@
+     "pdh": "AQAAAAE3AAADEAAAAwAAAAIAAAAZzB1NV5cz0ISI+tYZQHDF/dw77x1Zz+u2jw0cUf+KR3u958kjxZlN5IFNIo7sUgkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8eYMemS1wynFwgVIgw9ZdHI+6qmsr91sCHKjJHGGBLRF3DHGYtdCLEsYQCVmJQywAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAC/3y8ro5AhFTmPkAnaWckGQXhPEnSKInCUEpNnGgufIttDMtWgsjaAX7Jve/Hjcg8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADe6oGDni6/LfA/HHDe0vBW4xoma82CBGyydXkq/PJfhO6fra1H9symYAiEd6db4n8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
+     "cpu0-id": "BlAwmcr4Ruya3YvEGe2EBxuWjMAfIYolslNNM92RsIKxLkWDDRqivqSBOD+qQRCYS9joBYSHMD1g+rmjY+MmVw=="
+   },
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
+@@ -38918,7 +38950,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -39319,7 +39351,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -39333,7 +39365,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -39734,7 +39766,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -39749,7 +39781,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -40261,7 +40293,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
+index 73d9a1b313..f67fc5d217 100644
+--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
+@@ -32139,12 +32139,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32238,7 +32270,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32246,7 +32278,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -32325,7 +32357,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -32333,7 +32365,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -34506,12 +34538,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35167,7 +35199,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35175,7 +35207,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -35294,7 +35326,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -35302,7 +35334,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -35509,12 +35541,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -38147,12 +38179,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -39675,16 +39707,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -39693,11 +39725,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
+@@ -39712,7 +39744,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -40113,7 +40145,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -40127,7 +40159,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -40528,7 +40560,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -40543,7 +40575,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -41055,7 +41087,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies
+index 2c4dcb149e..d6ddd6a3c9 100644
+--- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies
++++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies
+@@ -31359,12 +31359,44 @@
+   "id": "libvirt-34"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-35"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-35"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-36"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-36"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -31454,7 +31486,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -31462,7 +31494,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -31541,7 +31573,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -31549,7 +31581,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -33738,12 +33770,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -34149,7 +34181,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -34157,7 +34189,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -34276,7 +34308,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -34284,7 +34316,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -34491,12 +34523,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -36342,12 +36374,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -37681,16 +37713,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+-  "id": "libvirt-43",
++  "id": "libvirt-45",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV is not enabled in KVM"
+@@ -37699,7 +37731,7 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -37727,7 +37759,7 @@
+     ],
+     "flc": true
+   },
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -37738,7 +37770,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -38143,7 +38175,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -38157,7 +38189,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -38562,7 +38594,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -38573,7 +38605,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -39089,7 +39121,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -39104,7 +39136,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -39620,7 +39652,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies
+index 8b8079617f..b4ce4668e1 100644
+--- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies
+@@ -32805,12 +32805,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32904,7 +32936,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32912,7 +32944,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -32991,7 +33023,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -32999,7 +33031,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -35206,12 +35238,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35617,7 +35649,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35625,7 +35657,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -35749,7 +35781,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -35757,7 +35789,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -35964,12 +35996,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -39021,12 +39053,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -40557,16 +40589,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -40575,11 +40607,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
+@@ -40594,7 +40626,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -40999,7 +41031,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -41013,7 +41045,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -41418,7 +41450,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -41429,7 +41461,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -41948,7 +41980,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -41963,7 +41995,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-50"
++  "id": "libvirt-52"
+ }
+ 
+ {
+@@ -42482,7 +42514,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-50"
++  "id": "libvirt-52"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.replies b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.replies
+index b8703698ce..168e3253ee 100644
+--- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.replies
++++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.replies
+@@ -32293,12 +32293,44 @@
+   "id": "libvirt-35"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-36"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-36"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -32392,7 +32424,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -32400,7 +32432,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32479,7 +32511,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32487,7 +32519,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -34718,12 +34750,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -35129,7 +35161,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -35137,7 +35169,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35261,7 +35293,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35269,7 +35301,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -35476,12 +35508,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -36861,12 +36893,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -38256,16 +38288,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+-  "id": "libvirt-44",
++  "id": "libvirt-46",
+   "error": {
+     "class": "GenericError",
+     "desc": "KVM not enabled"
+@@ -38274,11 +38306,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
+@@ -38293,7 +38325,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -38701,7 +38733,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -38715,7 +38747,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -39123,7 +39155,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -39134,7 +39166,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -39658,7 +39690,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -39673,7 +39705,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -40197,7 +40229,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies
+index 72f27e7a48..cb4abb4533 100644
+--- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies
+@@ -33072,12 +33072,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -33171,7 +33203,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -33179,7 +33211,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -33258,7 +33290,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -33266,7 +33298,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -35497,12 +35529,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35908,7 +35940,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -35916,7 +35948,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -36040,7 +36072,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -36048,7 +36080,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -36255,12 +36287,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -38316,12 +38348,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -39852,16 +39884,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV is not enabled in KVM"
+@@ -39870,11 +39902,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
+@@ -39889,7 +39921,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -40297,7 +40329,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -40311,7 +40343,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -40719,7 +40751,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -40730,7 +40762,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -41254,7 +41286,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -41269,7 +41301,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-50"
++  "id": "libvirt-52"
+ }
+ 
+ {
+@@ -41793,7 +41825,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-50"
++  "id": "libvirt-52"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
+index c248bced28..9ca1e062f8 100644
+--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
++++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
+@@ -25425,12 +25425,44 @@
+   "id": "libvirt-31"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-33"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-33"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -25505,7 +25537,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -25513,7 +25545,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -25587,12 +25619,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -25955,7 +25987,7 @@
+       "default-ram-id": "mpc8544ds.ram"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -25963,7 +25995,7 @@
+   "arguments": {
+     "typename": "pseries-6.2-machine"
+   },
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -26195,7 +26227,7 @@
+       "type": "string"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -26203,7 +26235,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -26306,12 +26338,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -28963,12 +28995,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -30091,7 +30123,7 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
+index 9b0d762799..60ad0860a1 100644
+--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
+@@ -25778,12 +25778,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -25862,7 +25894,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -25870,7 +25902,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -25944,7 +25976,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -25952,7 +25984,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -27692,12 +27724,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -28180,7 +28212,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -28188,7 +28220,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -28291,7 +28323,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -28299,7 +28331,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -28463,12 +28495,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -30492,12 +30524,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -31817,16 +31849,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -31835,11 +31867,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "SGX is not enabled in KVM"
+@@ -31854,7 +31886,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -32187,7 +32219,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -32201,7 +32233,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -32534,7 +32566,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -32549,7 +32581,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -32882,7 +32914,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
+index 58a624b006..9eeaa3633e 100644
+--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
++++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
+@@ -26130,12 +26130,44 @@
+   "id": "libvirt-32"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-33"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-33"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-34"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-34"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -26214,7 +26246,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -26222,7 +26254,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -26296,12 +26328,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -26673,7 +26705,7 @@
+       "default-ram-id": "ppc_spapr.ram"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -26681,7 +26713,7 @@
+   "arguments": {
+     "typename": "pseries-7.0-machine"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -26913,7 +26945,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -26921,7 +26953,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -27024,12 +27056,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -29555,12 +29587,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -30747,7 +30779,7 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
+index 6f27d3a349..d6ba5062e9 100644
+--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
+@@ -26292,12 +26292,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -26376,7 +26408,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -26384,7 +26416,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -26458,7 +26490,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -26466,7 +26498,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -28222,12 +28254,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -28728,7 +28760,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -28736,7 +28768,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -28839,7 +28871,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -28847,7 +28879,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -29024,12 +29056,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -31089,12 +31121,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -32418,16 +32450,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -32436,7 +32468,7 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -32457,7 +32489,7 @@
+       }
+     ]
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -32468,7 +32500,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -32805,7 +32837,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -32819,7 +32851,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -33156,7 +33188,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -33171,7 +33203,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -33508,7 +33540,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
+index 546214a9ef..582a541a87 100644
+--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
++++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
+@@ -26820,12 +26820,44 @@
+   "id": "libvirt-32"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-33"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-33"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-34"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-34"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -26904,7 +26936,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -26912,7 +26944,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -26986,12 +27018,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -27372,7 +27404,7 @@
+       "default-ram-id": "ppc_spapr.ram"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -27380,7 +27412,7 @@
+   "arguments": {
+     "typename": "pseries-7.1-machine"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -27622,7 +27654,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -27630,7 +27662,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -27743,12 +27775,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -30262,12 +30294,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -31454,7 +31486,7 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
+index fcee75b20a..f8a7da376c 100644
+--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
+@@ -27037,12 +27037,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -27121,7 +27153,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -27129,7 +27161,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -27203,7 +27235,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -27211,7 +27243,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -29004,12 +29036,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -29528,7 +29560,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -29536,7 +29568,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -29649,7 +29681,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -29657,7 +29689,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -29849,12 +29881,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -31793,12 +31825,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -33122,16 +33154,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -33140,11 +33172,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "SGX is not enabled in KVM"
+@@ -33159,7 +33191,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -33497,7 +33529,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -33511,7 +33543,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -33849,7 +33881,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -33864,7 +33896,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -34202,7 +34234,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
+index a55685c8f0..42e92e070b 100644
+--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
++++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
+@@ -27426,12 +27426,44 @@
+   "id": "libvirt-30"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-32"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -27515,7 +27547,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -27523,7 +27555,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -27602,12 +27634,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -27710,7 +27742,7 @@
+       "default-ram-id": "mpc8544ds.ram"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -27718,7 +27750,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -27831,12 +27863,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -30146,12 +30178,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -31467,5 +31499,5 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+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 1095899c6e..d4101c3c89 100644
+--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
++++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
+@@ -28006,12 +28006,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -28095,7 +28127,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -28103,7 +28135,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -28182,7 +28214,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -28190,7 +28222,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -29983,12 +30015,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -30525,7 +30557,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -30533,7 +30565,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -30646,7 +30678,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -30654,7 +30686,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -30846,12 +30878,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -32790,12 +32822,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -34119,16 +34151,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -34137,11 +34169,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "SGX is not enabled in KVM"
+@@ -34156,7 +34188,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -34494,7 +34526,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -34508,7 +34540,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -34846,7 +34878,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -34861,7 +34893,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -35199,7 +35231,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
+index f87ebf41ee..801fbf5ad6 100644
+--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
+@@ -28006,12 +28006,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -28095,7 +28127,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -28103,7 +28135,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -28182,7 +28214,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -28190,7 +28222,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -29983,12 +30015,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -30525,7 +30557,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -30533,7 +30565,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -30646,7 +30678,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -30654,7 +30686,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -30846,12 +30878,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -32790,12 +32822,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -34119,16 +34151,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -34137,11 +34169,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "SGX is not enabled in KVM"
+@@ -34156,7 +34188,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -34494,7 +34526,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -34508,7 +34540,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -34846,7 +34878,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -34861,7 +34893,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -35199,7 +35231,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
+index 49faceec28..97d1531611 100644
+--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
+@@ -29355,12 +29355,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -29444,7 +29476,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -29452,7 +29484,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -29531,7 +29563,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -29539,7 +29571,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -31356,12 +31388,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -31977,7 +32009,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -31985,7 +32017,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -32098,7 +32130,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -32106,7 +32138,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -32298,12 +32330,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -34349,12 +34381,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -35795,16 +35827,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -35813,11 +35845,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "SGX is not enabled in KVM"
+@@ -35832,7 +35864,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -36175,7 +36207,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -36189,7 +36221,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -36532,7 +36564,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -36547,7 +36579,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -36996,7 +37028,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
+index 8a71843283..6bd4f80dc2 100644
+--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
++++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
+@@ -27805,12 +27805,44 @@
+   "id": "libvirt-29"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-30"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-30"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-31"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-30"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -27895,7 +27927,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-30"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -27903,7 +27935,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -27982,12 +28014,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -28262,7 +28294,7 @@
+       "default-ram-id": "s390.ram"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -28270,7 +28302,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -28383,12 +28415,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -29152,12 +29184,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -30380,7 +30412,7 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -30391,7 +30423,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -30440,7 +30472,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
+index 458d656220..10906cb369 100644
+--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
+@@ -30132,12 +30132,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -30226,7 +30258,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -30234,7 +30266,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -30313,7 +30345,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -30321,7 +30353,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -32218,12 +32250,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -32859,7 +32891,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -32867,7 +32899,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -32980,7 +33012,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -32988,7 +33020,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -33176,12 +33208,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -35563,12 +35595,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -37026,16 +37058,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -37044,11 +37076,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "SGX is not enabled in KVM"
+@@ -37063,7 +37095,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -37426,7 +37458,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -37440,7 +37472,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -37803,7 +37835,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -37818,7 +37850,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -38287,7 +38319,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies
+index d1ca8b37f5..002ca31b9f 100644
+--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies
++++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies
+@@ -31154,12 +31154,44 @@
+   "id": "libvirt-31"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-33"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-33"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -31249,7 +31281,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -31257,7 +31289,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -31336,7 +31368,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -31344,7 +31376,7 @@
+   "arguments": {
+     "typename": "max-arm-cpu"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -31553,12 +31585,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -32670,7 +32702,7 @@
+       "default-ram-id": "ram"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -32678,7 +32710,7 @@
+   "arguments": {
+     "typename": "virt-8.2-machine"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -32914,7 +32946,7 @@
+       "type": "child<cfi.pflash01>"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -32922,7 +32954,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -33035,12 +33067,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -33334,12 +33366,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -34704,12 +34736,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-gic-capabilities",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -34725,7 +34757,7 @@
+       "kernel": false
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -34736,7 +34768,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -34769,7 +34801,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -34784,11 +34816,11 @@
+       }
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+-  "id": "libvirt-42",
++  "id": "libvirt-44",
+   "error": {
+     "class": "GenericError",
+     "desc": "Parameter 'hv-passthrough' is unexpected"
+diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies
+index d28046578d..b8f7b6f68a 100644
+--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies
++++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies
+@@ -31388,12 +31388,44 @@
+   "id": "libvirt-31"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-33"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-33"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -31487,7 +31519,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -31495,7 +31527,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -31574,7 +31606,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -31582,7 +31614,7 @@
+   "arguments": {
+     "typename": "max-arm-cpu"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -31724,12 +31756,12 @@
+       "type": "link<irq>"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -32787,7 +32819,7 @@
+       "default-ram-id": "ram"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -32795,7 +32827,7 @@
+   "arguments": {
+     "typename": "virt-8.2-machine"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -33031,7 +33063,7 @@
+       "type": "child<cfi.pflash01>"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -33039,7 +33071,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -33152,12 +33184,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -33379,12 +33411,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -34866,12 +34898,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-gic-capabilities",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -34887,7 +34919,7 @@
+       "kernel": false
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -34898,11 +34930,11 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+-  "id": "libvirt-41",
++  "id": "libvirt-43",
+   "error": {
+     "class": "GenericError",
+     "desc": "The CPU type 'host' requires KVM"
+@@ -34921,11 +34953,11 @@
+       }
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+-  "id": "libvirt-42",
++  "id": "libvirt-44",
+   "error": {
+     "class": "GenericError",
+     "desc": "The CPU type 'host' requires KVM"
+diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies
+index 7f2bb97635..a908ebf644 100644
+--- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies
++++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies
+@@ -28042,12 +28042,44 @@
+   "id": "libvirt-30"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-32"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -28137,7 +28169,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -28145,7 +28177,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -28224,12 +28256,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -28263,7 +28295,7 @@
+       "default-ram-id": "ram"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -28271,7 +28303,7 @@
+   "arguments": {
+     "typename": "virt-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -28403,7 +28435,7 @@
+       "type": "str"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -28411,7 +28443,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -28524,12 +28556,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -28553,12 +28585,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -29873,7 +29905,7 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -29884,11 +29916,11 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+-  "id": "libvirt-38",
++  "id": "libvirt-40",
+   "error": {
+     "class": "GenericError",
+     "desc": "The CPU type 'host' is not a recognized LoongArch CPU type"
+diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies
+index 492cef2065..4ee07edb25 100644
+--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies
++++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies
+@@ -28498,12 +28498,44 @@
+   "id": "libvirt-29"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-30"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-30"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-31"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-30"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -28593,7 +28625,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-30"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -28601,7 +28633,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -28680,12 +28712,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -28970,7 +29002,7 @@
+       "default-ram-id": "s390.ram"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -28978,7 +29010,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -29091,12 +29123,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -29860,12 +29892,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -31096,7 +31128,7 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -31107,7 +31139,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -31156,7 +31188,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
+index 4b34b01eea..aedd6ec2de 100644
+--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
+@@ -30823,12 +30823,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -30922,7 +30954,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -30930,7 +30962,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -31009,7 +31041,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -31017,7 +31049,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -32930,12 +32962,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -33551,7 +33583,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -33559,7 +33591,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -33672,7 +33704,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -33680,7 +33712,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -33868,12 +33900,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -36255,12 +36287,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -37731,16 +37763,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -37749,11 +37781,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "SGX is not enabled in KVM"
+@@ -37768,7 +37800,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -38135,7 +38167,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -38149,7 +38181,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -38516,7 +38548,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -38531,7 +38563,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -39004,7 +39036,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies
+index 2d492d7b06..90086a65cc 100644
+--- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies
++++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies
+@@ -24332,12 +24332,44 @@
+   }
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-17"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-17"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-18"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-18"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-17"
++  "id": "libvirt-19"
+ }
+ 
+ {
+@@ -24431,7 +24463,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-17"
++  "id": "libvirt-19"
+ }
+ 
+ {
+@@ -24439,7 +24471,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-18"
++  "id": "libvirt-20"
+ }
+ 
+ {
+@@ -24518,12 +24550,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-18"
++  "id": "libvirt-20"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-19"
++  "id": "libvirt-21"
+ }
+ 
+ {
+@@ -24639,7 +24671,7 @@
+       "default-ram-id": "ram"
+     }
+   ],
+-  "id": "libvirt-19"
++  "id": "libvirt-21"
+ }
+ 
+ {
+@@ -24647,7 +24679,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-20"
++  "id": "libvirt-22"
+ }
+ 
+ {
+@@ -24760,12 +24792,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-20"
++  "id": "libvirt-22"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-21"
++  "id": "libvirt-23"
+ }
+ 
+ {
+@@ -26098,5 +26130,5 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-21"
++  "id": "libvirt-23"
+ }
+diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
+index 6099885857..270ba9f557 100644
+--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
+@@ -31019,12 +31019,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -31118,7 +31150,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -31126,7 +31158,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -31205,7 +31237,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -31213,7 +31245,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -33130,12 +33162,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -33771,7 +33803,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -33779,7 +33811,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -33892,7 +33924,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -33900,7 +33932,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -34092,12 +34124,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -36479,12 +36511,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -37959,16 +37991,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -37977,11 +38009,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "SGX is not enabled in KVM"
+@@ -37996,7 +38028,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -38364,7 +38396,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -38378,7 +38410,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -38746,7 +38778,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -38761,7 +38793,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -39235,7 +39267,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies
+index 51896936cc..e0a9a3082b 100644
+--- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies
++++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies
+@@ -29380,12 +29380,44 @@
+   "id": "libvirt-29"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-30"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-30"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-31"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-30"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -29479,7 +29511,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-30"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -29487,7 +29519,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -29566,12 +29598,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -29646,7 +29678,7 @@
+       "default-ram-id": "riscv_virt_board.ram"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -29654,7 +29686,7 @@
+   "arguments": {
+     "typename": "virt-machine"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -29810,7 +29842,7 @@
+       "type": "child<cfi.pflash01>"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -29818,7 +29850,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -29931,12 +29963,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -30020,12 +30052,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -31439,7 +31471,7 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -31450,11 +31482,11 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+-  "id": "libvirt-37",
++  "id": "libvirt-39",
+   "error": {
+     "class": "GenericError",
+     "desc": "The requested expansion type is not supported"
+diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies
+index d8f0b032ba..4ea1a6a6f7 100644
+--- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies
++++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies
+@@ -29547,12 +29547,44 @@
+   "id": "libvirt-30"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-32"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -29642,7 +29674,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -29650,7 +29682,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -29729,12 +29761,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -30039,7 +30071,7 @@
+       "default-ram-id": "s390.ram"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -30047,7 +30079,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -30160,12 +30192,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -30803,12 +30835,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -32047,7 +32079,7 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -32058,7 +32090,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32130,7 +32162,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32141,7 +32173,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -32213,7 +32245,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies
+index 7c6c525d12..257e43a145 100644
+--- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies
+@@ -31428,12 +31428,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -31527,7 +31559,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -31535,7 +31567,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -31614,7 +31646,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -31622,7 +31654,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -33671,12 +33703,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -34292,7 +34324,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -34300,7 +34332,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -34413,7 +34445,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -34421,7 +34453,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -34613,12 +34645,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -37169,12 +37201,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -38657,16 +38689,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -38675,11 +38707,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
+@@ -38694,7 +38726,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -39072,7 +39104,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -39086,7 +39118,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -39464,7 +39496,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -39479,7 +39511,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -39967,7 +39999,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies
+index 66dcfe42d0..14b11c5c30 100644
+--- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies
++++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies
+@@ -30529,12 +30529,44 @@
+   "id": "libvirt-27"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-28"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-28"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-29"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-29"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-28"
++  "id": "libvirt-30"
+ }
+ 
+ {
+@@ -30619,7 +30651,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-28"
++  "id": "libvirt-30"
+ }
+ 
+ {
+@@ -30627,7 +30659,7 @@
+   "arguments": {
+     "typename": "max-arm-cpu"
+   },
+-  "id": "libvirt-29"
++  "id": "libvirt-31"
+ }
+ 
+ {
+@@ -30784,12 +30816,12 @@
+       "type": "link<irq>"
+     }
+   ],
+-  "id": "libvirt-29"
++  "id": "libvirt-31"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-30"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -31839,7 +31871,7 @@
+       "default-ram-id": "ram"
+     }
+   ],
+-  "id": "libvirt-30"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -31847,7 +31879,7 @@
+   "arguments": {
+     "typename": "virt-9.2-machine"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -32088,7 +32120,7 @@
+       "type": "child<cfi.pflash01>"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -32096,7 +32128,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -32214,12 +32246,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -32513,12 +32545,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -33834,12 +33866,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-gic-capabilities",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -33855,7 +33887,7 @@
+       "kernel": false
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -33866,11 +33898,11 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+-  "id": "libvirt-36",
++  "id": "libvirt-38",
+   "error": {
+     "class": "GenericError",
+     "desc": "The CPU type 'host' requires KVM"
+@@ -33889,11 +33921,11 @@
+       }
+     }
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+-  "id": "libvirt-37",
++  "id": "libvirt-39",
+   "error": {
+     "class": "GenericError",
+     "desc": "The CPU type 'host' requires KVM"
+diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies
+index 1a47f2b71b..78a59cf3e5 100644
+--- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies
++++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies
+@@ -29757,12 +29757,44 @@
+   "id": "libvirt-30"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-32"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -29852,7 +29884,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -29860,7 +29892,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -29939,12 +29971,12 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-34"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -30259,7 +30291,7 @@
+       "default-ram-id": "s390.ram"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -30267,7 +30299,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -30385,12 +30417,12 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -31028,12 +31060,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -32281,7 +32313,7 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -32292,7 +32324,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32364,7 +32396,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -32375,7 +32407,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -32516,7 +32548,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies
+index 764b71bcdc..81a4188752 100644
+--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies
++++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies
+@@ -31872,12 +31872,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -31971,7 +32003,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -31979,7 +32011,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -32058,7 +32090,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -32066,7 +32098,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -34208,12 +34240,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -34859,7 +34891,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -34867,7 +34899,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -34985,7 +35017,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -34993,7 +35025,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -35191,12 +35223,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -36821,12 +36853,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -38339,12 +38371,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -38355,16 +38387,16 @@
+     "pdh": "AQAAAAE3AAADEAAAAwAAAAIAAAAZzB1NV5cz0ISI+tYZQHDF/dw77x1Zz+u2jw0cUf+KR3u958kjxZlN5IFNIo7sUgkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8eYMemS1wynFwgVIgw9ZdHI+6qmsr91sCHKjJHGGBLRF3DHGYtdCLEsYQCVmJQywAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAC/3y8ro5AhFTmPkAnaWckGQXhPEnSKInCUEpNnGgufIttDMtWgsjaAX7Jve/Hjcg8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADe6oGDni6/LfA/HHDe0vBW4xoma82CBGyydXkq/PJfhO6fra1H9symYAiEd6db4n8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
+     "cpu0-id": "BlAwmcr4Ruya3YvEGe2EBxuWjMAfIYolslNNM92RsIKxLkWDDRqivqSBOD+qQRCYS9joBYSHMD1g+rmjY+MmVw=="
+   },
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
+@@ -38379,7 +38411,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -38779,7 +38811,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -38793,7 +38825,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -39193,7 +39225,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -39208,7 +39240,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -39719,7 +39751,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies
+index 1b68825df6..69182ce4fc 100644
+--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies
+@@ -31764,12 +31764,44 @@
+   "id": "libvirt-36"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-block"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-37"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "scsi-generic"
++  },
++  "id": "libvirt-38"
++}
++
++{
++  "error": {
++    "class": "DeviceNotFound",
++    "desc": "The libvirt device dump was not collected for this version+device tuple"
++  },
++  "id": "libvirt-38"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -31863,7 +31895,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -31871,7 +31903,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -31950,7 +31982,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -31958,7 +31990,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -34100,12 +34132,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -34741,7 +34773,7 @@
+       "default-ram-id": "pc.ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -34749,7 +34781,7 @@
+   "arguments": {
+     "typename": "none-machine"
+   },
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -34867,7 +34899,7 @@
+       "type": "child<container>"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -34875,7 +34907,7 @@
+   "arguments": {
+     "typename": "generic-pc-machine"
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -35073,12 +35105,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -37521,12 +37553,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -39019,16 +39051,16 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-46"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-47"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-47",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
+@@ -39037,11 +39069,11 @@
+ 
+ {
+   "execute": "query-sgx-capabilities",
+-  "id": "libvirt-46"
++  "id": "libvirt-48"
+ }
+ 
+ {
+-  "id": "libvirt-46",
++  "id": "libvirt-48",
+   "error": {
+     "class": "GenericError",
+     "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
+@@ -39056,7 +39088,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -39456,7 +39488,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -39470,7 +39502,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -39870,7 +39902,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -39885,7 +39917,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+@@ -40396,7 +40428,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-51"
+ }
+ 
+ {
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-complete-vhostuser-passt-support.patch b/SOURCES/libvirt-qemu-complete-vhostuser-passt-support.patch
deleted file mode 100644
index a84b7c4..0000000
--- a/SOURCES/libvirt-qemu-complete-vhostuser-passt-support.patch
+++ /dev/null
@@ -1,663 +0,0 @@
-From 7ffdf87f44ae20be4f2a1d1d18b4da969414edc2 Mon Sep 17 00:00:00 2001
-Message-ID: <7ffdf87f44ae20be4f2a1d1d18b4da969414edc2.1739824249.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Wed, 12 Feb 2025 16:16:44 -0500
-Subject: [PATCH] qemu: complete vhostuser + passt support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-<interface type='vhostuser'><backend type='passt'/> needs to run the
-passt command just as is done for interface type='user', but then add
-vhostuser bits to the qemu commandline/monitor command.
-
-There are some changes to the parsing/validation along with changes to
-the vhostuser codepath do do the extra stuff for passt. I tried
-keeping them separated into different patches, but then the unit test
-failed in a strange way deep down in the bowels of the commandline
-generation, so this patch both 1) makes the final changes to
-parsing/formatting and 2) adds passt stuff at appropriate places for
-vhostuser (as well as making a couple of things *not* happen when the
-passt backend is chosen). The result is that you can now have:
-
-    <interface type='vhostuser'>
-      <backend type='passt'/>
-      ...
-    </interface>
-
-Then as long as you also have the following as a subelement of
-<domain>:
-
-    <memoryBacking>
-      <access mode='shared'/>
-    </memoryBacking>
-
-your passt interfaces will benefit from the greatly improved
-efficiency of a vhost-user data path, and all without requiring
-special privileges or capabilities *anywhere* (i.e. it works for
-unprivileged libvirt (qemu:///session) as well as privileged libvirt).
-
-Resolves: https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 1e9054b9c79d721a55f413c2983c5370044f8f60)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/conf/domain_conf.c                        | 36 ++++++---
- src/conf/domain_validate.c                    | 77 +++++++------------
- src/conf/schemas/domaincommon.rng             | 32 +++++++-
- src/qemu/qemu_command.c                       |  7 +-
- src/qemu/qemu_extdevice.c                     |  6 +-
- src/qemu/qemu_hotplug.c                       | 21 ++++-
- src/qemu/qemu_passt.c                         |  3 +
- src/qemu/qemu_process.c                       | 15 +++-
- src/qemu/qemu_validate.c                      |  7 +-
- ...t-user-slirp-portforward.x86_64-latest.err |  2 +-
- .../net-vhostuser-passt.x86_64-latest.args    | 42 ++++++++++
- .../net-vhostuser-passt.x86_64-latest.xml     | 72 +++++++++++++++++
- tests/qemuxmlconfdata/net-vhostuser-passt.xml | 70 +++++++++++++++++
- tests/qemuxmlconftest.c                       |  1 +
- 14 files changed, 317 insertions(+), 74 deletions(-)
- create mode 100644 tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
- create mode 100644 tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml
- create mode 100644 tests/qemuxmlconfdata/net-vhostuser-passt.xml
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index b1e9dda80e..095b9bbaa2 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -9448,9 +9448,25 @@ virDomainNetBackendParseXML(xmlNodePtr node,
-     g_autofree char *tap = virXMLPropString(node, "tap");
-     g_autofree char *vhost = virXMLPropString(node, "vhost");
- 
--    /* The VIR_DOMAIN_NET_BACKEND_DEFAULT really means 'use hypervisor's
--     * builtin SLIRP'. It's reported in domain caps and thus we need to accept
--     * it. Hence VIR_XML_PROP_NONE instead of VIR_XML_PROP_NONZERO. */
-+    /* In the case of NET_TYPE_USER, backend type can be unspecified
-+     * (i.e. VIR_DOMAIN_NET_BACKEND_DEFAULT) and that means 'use
-+     * hypervisor's builtin SLIRP (or if that isn't available, use
-+     * passt)'. Similarly, it can also be left unspecified in the case
-+     * of NET_TYPE_VHOSTUSER, and then it means "use the traditional
-+     * vhost-user backend (which auto-detects between connecting to a
-+     * socket created by OVS, or connecting to a standalone socket
-+     * used (mostly in testing) to connect the vhost-user interface of
-+     * one guest directly to the vhost-user interface of another
-+     * guest.
-+     *
-+     * If backend type is set to 'passt', then in both cases a passt
-+     * process will be started, and libvirt will connect that to the
-+     * guest interface (either communicating everything over the
-+     * socket created by passt using a specific-to-passt protocol
-+     * (interface type='user'>), or by using the socket for control
-+     * plane messages and shared memory for data using the vhost-user
-+     * protocol (<interface type='vhostuser'>)).
-+     */
-     if (virXMLPropEnum(node, "type", virDomainNetBackendTypeFromString,
-                        VIR_XML_PROP_NONE, &def->backend.type) < 0) {
-         return -1;
-@@ -24581,7 +24597,11 @@ virDomainNetDefFormat(virBuffer *buf,
-             break;
- 
-         case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
--            if (def->data.vhostuser->type == VIR_DOMAIN_CHR_TYPE_UNIX) {
-+            if (def->data.vhostuser->type == VIR_DOMAIN_CHR_TYPE_UNIX &&
-+                def->backend.type != VIR_DOMAIN_NET_BACKEND_PASST) {
-+                /* in the case of BACKEND_PASST, the values of all of these are either
-+                 * fixed (type, mode, reconnect), or derived from elsewhere (path)
-+                 */
-                 virBufferAddLit(&sourceAttrBuf, " type='unix'");
-                 virBufferEscapeString(&sourceAttrBuf, " path='%s'",
-                                       def->data.vhostuser->data.nix.path);
-@@ -24592,7 +24612,6 @@ virDomainNetDefFormat(virBuffer *buf,
-                     virDomainChrSourceReconnectDefFormat(&sourceChildBuf,
-                                                          &def->data.vhostuser->data.nix.reconnect);
-                 }
--
-             }
-             break;
- 
-@@ -24654,15 +24673,14 @@ virDomainNetDefFormat(virBuffer *buf,
-         }
- 
-         case VIR_DOMAIN_NET_TYPE_USER:
--            if (def->backend.type == VIR_DOMAIN_NET_BACKEND_PASST)
--                virBufferEscapeString(&sourceAttrBuf, " dev='%s'", def->sourceDev);
--            break;
--
-         case VIR_DOMAIN_NET_TYPE_NULL:
-         case VIR_DOMAIN_NET_TYPE_LAST:
-             break;
-         }
- 
-+        if (def->backend.type == VIR_DOMAIN_NET_BACKEND_PASST)
-+            virBufferEscapeString(&sourceAttrBuf, " dev='%s'", def->sourceDev);
-+
-         if (def->hostIP.nips || def->hostIP.nroutes) {
-             if (virDomainNetIPInfoFormat(&sourceChildBuf, &def->hostIP) < 0)
-                 return -1;
-diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
-index dacde1f780..597ae3d938 100644
---- a/src/conf/domain_validate.c
-+++ b/src/conf/domain_validate.c
-@@ -2157,67 +2157,46 @@ virDomainNetDefValidate(const virDomainNetDef *net)
-         return -1;
-     }
- 
--    if (net->type != VIR_DOMAIN_NET_TYPE_USER) {
-+    if (net->type != VIR_DOMAIN_NET_TYPE_USER &&
-+        net->type != VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
-         if (net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
-             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                           _("The 'passt' backend can only be used with interface type='user'"));
-+                           _("The 'passt' backend can only be used with interface type='user' or type='vhostuser'"));
-             return -1;
-         }
-     }
- 
--    if (net->nPortForwards > 0 &&
--        (net->type != VIR_DOMAIN_NET_TYPE_USER ||
--         (net->type == VIR_DOMAIN_NET_TYPE_USER &&
--          net->backend.type != VIR_DOMAIN_NET_BACKEND_PASST))) {
--        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                       _("The <portForward> element can only be used with <interface type='user'> and its 'passt' backend"));
--        return -1;
--    }
-+    if (net->nPortForwards > 0) {
-+        size_t p;
- 
--    if (!virNetDevBandwidthValidate(net->bandwidth)) {
--        return -1;
--    }
-+        if ((net->type != VIR_DOMAIN_NET_TYPE_USER &&
-+            net->type != VIR_DOMAIN_NET_TYPE_VHOSTUSER) ||
-+            net->backend.type != VIR_DOMAIN_NET_BACKEND_PASST) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("The <portForward> element can only be used with the 'passt' backend of interface type='user' or type='vhostuser'"));
-+            return -1;
-+        }
- 
--    switch (net->type) {
--    case VIR_DOMAIN_NET_TYPE_USER:
--        if (net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
--            size_t p;
--
--            for (p = 0; p < net->nPortForwards; p++) {
--                size_t r;
--                virDomainNetPortForward *pf = net->portForwards[p];
--
--                for (r = 0; r < pf->nRanges; r++) {
--                    virDomainNetPortForwardRange *range = pf->ranges[r];
--
--                    if (!range->start
--                        && (range->end || range->to
--                            || range->exclude != VIR_TRISTATE_BOOL_ABSENT)) {
--                        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                                       _("The 'range' of a 'portForward' requires 'start' attribute if 'end', 'to', or 'exclude' is specified"));
--                        return -1;
--                    }
-+        for (p = 0; p < net->nPortForwards; p++) {
-+            size_t r;
-+            virDomainNetPortForward *pf = net->portForwards[p];
-+
-+            for (r = 0; r < pf->nRanges; r++) {
-+                virDomainNetPortForwardRange *range = pf->ranges[r];
-+
-+                if (!range->start
-+                    && (range->end || range->to
-+                        || range->exclude != VIR_TRISTATE_BOOL_ABSENT)) {
-+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                                   _("The 'range' of a 'portForward' requires 'start' attribute if 'end', 'to', or 'exclude' is specified"));
-+                    return -1;
-                 }
-             }
-         }
--        break;
-+    }
- 
--    case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
--    case VIR_DOMAIN_NET_TYPE_NETWORK:
--    case VIR_DOMAIN_NET_TYPE_VDPA:
--    case VIR_DOMAIN_NET_TYPE_BRIDGE:
--    case VIR_DOMAIN_NET_TYPE_CLIENT:
--    case VIR_DOMAIN_NET_TYPE_SERVER:
--    case VIR_DOMAIN_NET_TYPE_MCAST:
--    case VIR_DOMAIN_NET_TYPE_UDP:
--    case VIR_DOMAIN_NET_TYPE_INTERNAL:
--    case VIR_DOMAIN_NET_TYPE_DIRECT:
--    case VIR_DOMAIN_NET_TYPE_HOSTDEV:
--    case VIR_DOMAIN_NET_TYPE_VDS:
--    case VIR_DOMAIN_NET_TYPE_ETHERNET:
--    case VIR_DOMAIN_NET_TYPE_NULL:
--    case VIR_DOMAIN_NET_TYPE_LAST:
--        break;
-+    if (!virNetDevBandwidthValidate(net->bandwidth)) {
-+        return -1;
-     }
- 
-     return 0;
-diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index cbc093ca7b..d433e95d8b 100644
---- a/src/conf/schemas/domaincommon.rng
-+++ b/src/conf/schemas/domaincommon.rng
-@@ -3486,8 +3486,36 @@
-           </attribute>
-           <interleave>
-             <optional>
--              <ref name="unixSocketSource"/>
--            </optional>
-+              <element name="source">
-+                <optional>
-+                  <attribute name="type">
-+                    <value>unix</value>
-+                  </attribute>
-+                </optional>
-+                <optional>
-+                  <attribute name="path">
-+                    <ref name="absFilePath"/>
-+                  </attribute>
-+                </optional>
-+                <optional>
-+                  <attribute name="mode">
-+                    <choice>
-+                      <value>server</value>
-+                      <value>client</value>
-+                    </choice>
-+                  </attribute>
-+                </optional>
-+                <optional>
-+                  <attribute name="dev">
-+                    <ref name="deviceName"/>
-+                  </attribute>
-+                </optional>
-+                <optional>
-+                  <ref name="reconnect"/>
-+                </optional>
-+                <empty/>
-+              </element>
-+             </optional>
-             <ref name="interface-options"/>
-           </interleave>
-         </group>
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 1f28de6194..24dac0ce0f 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -8617,11 +8617,12 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
-         if (qemuInterfaceVhostuserConnect(cmd, net, qemuCaps) < 0)
-             goto cleanup;
- 
--        if (virNetDevOpenvswitchGetVhostuserIfname(net->data.vhostuser->data.nix.path,
-+        if (net->backend.type != VIR_DOMAIN_NET_BACKEND_PASST &&
-+            virNetDevOpenvswitchGetVhostuserIfname(net->data.vhostuser->data.nix.path,
-                                                    net->data.vhostuser->data.nix.listen,
--                                                   &net->ifname) < 0)
-+                                                   &net->ifname) < 0) {
-             goto cleanup;
--
-+        }
-         break;
- 
-     case VIR_DOMAIN_NET_TYPE_VDPA:
-diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
-index 954cb323a4..2384bab7a6 100644
---- a/src/qemu/qemu_extdevice.c
-+++ b/src/qemu/qemu_extdevice.c
-@@ -212,13 +212,15 @@ qemuExtDevicesStart(virQEMUDriver *driver,
-     for (i = 0; i < def->nnets; i++) {
-         virDomainNetDef *net = def->nets[i];
- 
--        if (net->type != VIR_DOMAIN_NET_TYPE_USER)
-+        if (net->type != VIR_DOMAIN_NET_TYPE_USER &&
-+            net->type != VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
-             continue;
-+        }
- 
-         if (net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
-             if (qemuPasstStart(vm, net) < 0)
-                 return -1;
--        } else {
-+        } else if (net->type == VIR_DOMAIN_NET_TYPE_USER) {
-             if (qemuSlirpStart(vm, net, incomingMigration) < 0)
-                 return -1;
-         }
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index de0777d330..c8746f5e22 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -1262,10 +1262,23 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
-         if (!(charDevAlias = qemuAliasChardevFromDevAlias(net->info.alias)))
-             goto cleanup;
- 
--        if (virNetDevOpenvswitchGetVhostuserIfname(net->data.vhostuser->data.nix.path,
--                                                   net->data.vhostuser->data.nix.listen,
--                                                   &net->ifname) < 0)
--            goto cleanup;
-+        if (net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
-+
-+            /* vhostuser needs socket path in this location, and when
-+             * backend is passt, the path is derived from other info,
-+             * not taken from config.
-+             */
-+            g_free(net->data.vhostuser->data.nix.path);
-+            net->data.vhostuser->data.nix.path = qemuPasstCreateSocketPath(vm, net);
-+
-+            if (qemuPasstStart(vm, net) < 0)
-+                goto cleanup;
-+        } else {
-+            if (virNetDevOpenvswitchGetVhostuserIfname(net->data.vhostuser->data.nix.path,
-+                                                       net->data.vhostuser->data.nix.listen,
-+                                                       &net->ifname) < 0)
-+                goto cleanup;
-+        }
- 
-         if (qemuSecuritySetNetdevLabel(driver, vm, net) < 0)
-             goto cleanup;
-diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c
-index 8a3ac4e988..b9616d1c63 100644
---- a/src/qemu/qemu_passt.c
-+++ b/src/qemu/qemu_passt.c
-@@ -180,6 +180,9 @@ qemuPasstStart(virDomainObj *vm,
- 
-     virCommandClearCaps(cmd);
- 
-+    if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_VHOSTUSER)
-+        virCommandAddArg(cmd, "--vhost-user");
-+
-     virCommandAddArgList(cmd,
-                          "--one-off",
-                          "--socket", passtSocketName,
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 26ca943dfc..7285fd5ce9 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -64,6 +64,7 @@
- #include "qemu_backup.h"
- #include "qemu_dbus.h"
- #include "qemu_snapshot.h"
-+#include "qemu_passt.h"
- 
- #include "cpu/cpu.h"
- #include "cpu/cpu_x86.h"
-@@ -5932,12 +5933,23 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm)
-             }
-             break;
- 
-+        case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
-+            if (net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
-+                /* when using the passt backend, the path of the
-+                 * unix socket is always derived from other info
-+                 * *not* manually given in the config, but all the
-+                 * vhostuser code looks for it there.
-+                 */
-+                g_free(net->data.vhostuser->data.nix.path);
-+                net->data.vhostuser->data.nix.path = qemuPasstCreateSocketPath(vm, net);
-+            }
-+            break;
-+
-         case VIR_DOMAIN_NET_TYPE_DIRECT:
-         case VIR_DOMAIN_NET_TYPE_BRIDGE:
-         case VIR_DOMAIN_NET_TYPE_NETWORK:
-         case VIR_DOMAIN_NET_TYPE_ETHERNET:
-         case VIR_DOMAIN_NET_TYPE_USER:
--        case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
-         case VIR_DOMAIN_NET_TYPE_SERVER:
-         case VIR_DOMAIN_NET_TYPE_CLIENT:
-         case VIR_DOMAIN_NET_TYPE_MCAST:
-@@ -5949,7 +5961,6 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm)
-         case VIR_DOMAIN_NET_TYPE_LAST:
-             break;
-         }
--
-     }
-     return 0;
- }
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index eb8c5366f6..f33c0c07b4 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -1736,7 +1736,9 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-         return -1;
-     }
- 
--    if (net->type == VIR_DOMAIN_NET_TYPE_USER) {
-+    if (net->type == VIR_DOMAIN_NET_TYPE_USER ||
-+        (net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER &&
-+         net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST)) {
-         virDomainCapsDeviceNet netCaps = { };
- 
-         virQEMUCapsFillDomainDeviceNetCaps(qemuCaps, &netCaps);
-@@ -1811,7 +1813,8 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-     }
- 
-     if (net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
--        if (!net->data.vhostuser->data.nix.path) {
-+        if (!net->data.vhostuser->data.nix.path &&
-+            net->backend.type != VIR_DOMAIN_NET_BACKEND_PASST) {
-             virReportError(VIR_ERR_XML_ERROR,
-                            _("Missing required attribute '%1$s' in element '%2$s'"),
-                            "path", "source");
-diff --git a/tests/qemuxmlconfdata/net-user-slirp-portforward.x86_64-latest.err b/tests/qemuxmlconfdata/net-user-slirp-portforward.x86_64-latest.err
-index eaa934742e..e231677e57 100644
---- a/tests/qemuxmlconfdata/net-user-slirp-portforward.x86_64-latest.err
-+++ b/tests/qemuxmlconfdata/net-user-slirp-portforward.x86_64-latest.err
-@@ -1 +1 @@
--unsupported configuration: The <portForward> element can only be used with <interface type='user'> and its 'passt' backend
-+unsupported configuration: The <portForward> element can only be used with the 'passt' backend of interface type='user' or type='vhostuser'
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
-new file mode 100644
-index 0000000000..21d78d6072
---- /dev/null
-+++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
-@@ -0,0 +1,42 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-+USER=test \
-+LOGNAME=test \
-+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-+/usr/bin/qemu-system-x86_64 \
-+-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 \
-+-accel tcg \
-+-cpu qemu64 \
-+-m size=219136k \
-+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-+-overcommit mem-lock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot strict=on \
-+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \
-+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-storage","id":"ide0-0-0","bootindex":1}' \
-+-chardev socket,id=charnet0,path=/var/run/libvirt/qemu/passt/-1-QEMUGuest1-net0.socket \
-+-netdev '{"type":"vhost-user","chardev":"charnet0","id":"hostnet0"}' \
-+-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \
-+-chardev socket,id=charnet1,path=/var/run/libvirt/qemu/passt/-1-QEMUGuest1-net1.socket \
-+-netdev '{"type":"vhost-user","chardev":"charnet1","id":"hostnet1"}' \
-+-device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:11","bus":"pci.0","addr":"0x3"}' \
-+-chardev socket,id=charnet2,path=/var/run/libvirt/qemu/passt/-1-QEMUGuest1-net2.socket \
-+-netdev '{"type":"vhost-user","chardev":"charnet2","id":"hostnet2"}' \
-+-device '{"driver":"virtio-net-pci","netdev":"hostnet2","id":"net2","mac":"00:11:22:33:44:11","bus":"pci.0","addr":"0x4"}' \
-+-audiodev '{"id":"audio1","driver":"none"}' \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml
-new file mode 100644
-index 0000000000..26aa4c8d05
---- /dev/null
-+++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml
-@@ -0,0 +1,72 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219136</memory>
-+  <currentMemory unit='KiB'>219136</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='x86_64' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='forbid'>qemu64</model>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0' model='none'/>
-+    <controller type='ide' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <interface type='vhostuser'>
-+      <mac address='00:11:22:33:44:55'/>
-+      <ip address='172.17.2.0' family='ipv4' prefix='24'/>
-+      <ip address='2001:db8:ac10:fd01::feed' family='ipv6'/>
-+      <portForward proto='tcp' address='2001:db8:ac10:fd01::1:10'>
-+        <range start='22' to='2022'/>
-+        <range start='1000' end='1050'/>
-+        <range start='1020' exclude='yes'/>
-+        <range start='1030' end='1040' exclude='yes'/>
-+      </portForward>
-+      <portForward proto='udp' address='1.2.3.4' dev='eth0'>
-+        <range start='5000' end='5020' to='6000'/>
-+        <range start='5010' end='5015' exclude='yes'/>
-+      </portForward>
-+      <portForward proto='tcp'>
-+        <range start='80'/>
-+      </portForward>
-+      <portForward proto='tcp'>
-+        <range start='443' to='344'/>
-+      </portForward>
-+      <model type='virtio'/>
-+      <backend type='passt' logFile='/var/log/loglaw.blog'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-+    </interface>
-+    <interface type='vhostuser'>
-+      <mac address='00:11:22:33:44:11'/>
-+      <model type='virtio'/>
-+      <backend type='passt'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-+    </interface>
-+    <interface type='vhostuser'>
-+      <mac address='00:11:22:33:44:11'/>
-+      <model type='virtio'/>
-+      <backend type='passt'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-+    </interface>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <audio id='1' type='none'/>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.xml b/tests/qemuxmlconfdata/net-vhostuser-passt.xml
-new file mode 100644
-index 0000000000..e44c91e541
---- /dev/null
-+++ b/tests/qemuxmlconfdata/net-vhostuser-passt.xml
-@@ -0,0 +1,70 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219136</memory>
-+  <currentMemory unit='KiB'>219136</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='x86_64' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0' model='none'/>
-+    <controller type='ide' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <interface type='vhostuser'>
-+      <mac address='00:11:22:33:44:55'/>
-+      <ip address='172.17.2.0' family='ipv4' prefix='24'/>
-+      <ip address='2001:db8:ac10:fd01::feed' family='ipv6'/>
-+      <source dev='eth42'/>
-+      <portForward proto='tcp' address='2001:db8:ac10:fd01::1:10'>
-+        <range start='22' to='2022'/>
-+        <range start='1000' end='1050'/>
-+        <range start='1020' exclude='yes'/>
-+        <range start='1030' end='1040' exclude='yes'/>
-+      </portForward>
-+      <portForward proto='udp' address='1.2.3.4' dev='eth0'>
-+        <range start='5000' end='5020' to='6000'/>
-+        <range start='5010' end='5015' exclude='yes'/>
-+      </portForward>
-+      <portForward proto='tcp'>
-+        <range start='80'/>
-+      </portForward>
-+      <portForward proto='tcp'>
-+        <range start='443' to='344'/>
-+      </portForward>
-+      <model type='virtio'/>
-+      <backend type='passt' logFile='/var/log/loglaw.blog'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-+    </interface>
-+    <interface type='vhostuser'>
-+      <mac address='00:11:22:33:44:11'/>
-+      <backend type='passt'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-+    </interface>
-+    <interface type='vhostuser'>
-+      <mac address='00:11:22:33:44:11'/>
-+      <source dev='eth43'/>
-+      <model type='virtio'/>
-+      <backend type='passt'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-+    </interface>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <audio id='1' type='none'/>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index 821d9b1048..9603984b60 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -1791,6 +1791,7 @@ mymain(void)
-     DO_TEST_CAPS_LATEST("net-user-passt");
-     DO_TEST_CAPS_VER("net-user-passt", "7.2.0");
-     DO_TEST_CAPS_LATEST_PARSE_ERROR("net-user-slirp-portforward");
-+    DO_TEST_CAPS_LATEST("net-vhostuser-passt");
-     DO_TEST_CAPS_LATEST("net-virtio");
-     DO_TEST_CAPS_LATEST("net-virtio-device");
-     DO_TEST_CAPS_LATEST("net-virtio-disable-offloads");
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-do-all-vhostuser-attribute-validation-in-qemu-driver.patch b/SOURCES/libvirt-qemu-do-all-vhostuser-attribute-validation-in-qemu-driver.patch
deleted file mode 100644
index 5f32d03..0000000
--- a/SOURCES/libvirt-qemu-do-all-vhostuser-attribute-validation-in-qemu-driver.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From a12b87879f0a1dca59c5953ac3a91a36685d17ce Mon Sep 17 00:00:00 2001
-Message-ID: <a12b87879f0a1dca59c5953ac3a91a36685d17ce.1739824249.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Sun, 9 Feb 2025 19:01:32 -0500
-Subject: [PATCH] qemu: do all vhostuser attribute validation in qemu driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since vhostuser is only used/supported by the QEMU driver, and all the
-rest of the vhostuser-specific validation is done in QEMU's
-validation, lets move the final check (to see if they've tried to
-enable auto-reconnect when this interface is on the server side of the
-vhostuser socket) to the QEMU validate.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 56f4cc167a6c93ec420c82f15a265ec08469279d)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/conf/domain_validate.c | 10 +---------
- src/qemu/qemu_validate.c   |  8 ++++++++
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
-index f56ff5b7bb..dacde1f780 100644
---- a/src/conf/domain_validate.c
-+++ b/src/conf/domain_validate.c
-@@ -2179,15 +2179,6 @@ virDomainNetDefValidate(const virDomainNetDef *net)
-     }
- 
-     switch (net->type) {
--    case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
--        if (net->data.vhostuser->data.nix.listen &&
--            net->data.vhostuser->data.nix.reconnect.enabled == VIR_TRISTATE_BOOL_YES) {
--            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                           _("'reconnect' attribute unsupported 'server' mode for <interface type='vhostuser'>"));
--            return -1;
--        }
--        break;
--
-     case VIR_DOMAIN_NET_TYPE_USER:
-         if (net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
-             size_t p;
-@@ -2211,6 +2202,7 @@ virDomainNetDefValidate(const virDomainNetDef *net)
-         }
-         break;
- 
-+    case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
-     case VIR_DOMAIN_NET_TYPE_NETWORK:
-     case VIR_DOMAIN_NET_TYPE_VDPA:
-     case VIR_DOMAIN_NET_TYPE_BRIDGE:
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index 841d320541..b7b2e3d0af 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -1810,6 +1810,14 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-         }
-     }
- 
-+    if (net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER &&
-+        net->data.vhostuser->data.nix.listen &&
-+        net->data.vhostuser->data.nix.reconnect.enabled == VIR_TRISTATE_BOOL_YES) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("'reconnect' attribute is not supported when source mode='server' for <interface type='vhostuser'>"));
-+        return -1;
-+    }
-+
-     if (!virDomainNetIsVirtioModel(net)) {
-         if (net->type == VIR_DOMAIN_NET_TYPE_VDPA ||
-             net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-domain-Initialize-FD-passthrough-for-a-virStorageSource-before-using-it.patch b/SOURCES/libvirt-qemu-domain-Initialize-FD-passthrough-for-a-virStorageSource-before-using-it.patch
deleted file mode 100644
index 77de866..0000000
--- a/SOURCES/libvirt-qemu-domain-Initialize-FD-passthrough-for-a-virStorageSource-before-using-it.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 763d97401abc5d656b13967b811c04688061e760 Mon Sep 17 00:00:00 2001
-Message-ID: <763d97401abc5d656b13967b811c04688061e760.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 6 Feb 2025 16:20:45 +0100
-Subject: [PATCH] qemu: domain: Initialize FD passthrough for a
- virStorageSource before using it
-
-The call to 'qemuBlockStorageSourceNeedsFormatLayer()' bases the
-decision also on the state of the passed FD, so we must initialize the
-passthrough data via 'qemuDomainPrepareStorageSourceFDs()' before the
-aforementioned call.
-
-In the test change it's visible that we didn't add the necessary 'raw'
-driver which allows the 'protocol' blockdev to be opened in 'rw' mode so
-that qemu picks the proper file descriptior while keeping the device
-read-only.
-
-Resolves: https://issues.redhat.com/browse/RHEL-37519
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 5830e564bbeb798cccce2988094d1218f6dc5a60)
-
-https://issues.redhat.com/browse/RHEL-37519
----
- src/qemu/qemu_domain.c                                 |  6 +++---
- .../qemuxmlconfdata/disk-source-fd.x86_64-latest.args  | 10 ++++++----
- 2 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 1fc4e2f33f..92035dd281 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -9677,6 +9677,9 @@ qemuDomainPrepareStorageSourceBlockdevNodename(virDomainDiskDef *disk,
-     /* qemuBlockStorageSourceSetStorageNodename steals 'nodestorage' */
-     qemuBlockStorageSourceSetStorageNodename(src, nodestorage);
- 
-+    if (qemuDomainPrepareStorageSourceFDs(src, priv) < 0)
-+        return -1;
-+
-     if (qemuBlockStorageSourceNeedsFormatLayer(src, priv->qemuCaps)) {
-         char *nodeformat = g_strdup_printf("%s-format", nodenameprefix);
- 
-@@ -9717,9 +9720,6 @@ qemuDomainPrepareStorageSourceBlockdevNodename(virDomainDiskDef *disk,
-     if (qemuDomainPrepareStorageSourceNFS(src) < 0)
-         return -1;
- 
--    if (qemuDomainPrepareStorageSourceFDs(src, priv) < 0)
--        return -1;
--
-     return 0;
- }
- 
-diff --git a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
-index d77b3ca505..27d852cf32 100644
---- a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
-@@ -33,11 +33,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
- -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qcow2","file":"libvirt-6-storage"}' \
- -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-6-format","id":"virtio-disk4","bootindex":1}' \
- -add-fd set=4,fd=209,opaque=libvirt-5-storage0 \
---blockdev '{"driver":"file","filename":"/dev/fdset/4","node-name":"libvirt-5-storage","read-only":true}' \
-+-blockdev '{"driver":"file","filename":"/dev/fdset/4","node-name":"libvirt-5-storage","read-only":false,"discard":"unmap"}' \
-+-blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"raw","file":"libvirt-5-storage"}' \
- -add-fd set=3,fd=247,opaque=libvirt-4-storage0 \
- -add-fd set=3,fd=248,opaque=libvirt-4-storage1 \
- -blockdev '{"driver":"file","filename":"/dev/fdset/3","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
---blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"qcow2","file":"libvirt-4-storage","backing":"libvirt-5-storage"}' \
-+-blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"qcow2","file":"libvirt-4-storage","backing":"libvirt-5-format"}' \
- -add-fd set=2,fd=204,opaque=libvirt-3-storage0 \
- -blockdev '{"driver":"file","filename":"/dev/fdset/2","node-name":"libvirt-3-storage","read-only":false,"discard":"unmap"}' \
- -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qcow2","file":"libvirt-3-storage","backing":"libvirt-4-format"}' \
-@@ -46,8 +47,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
- -blockdev '{"driver":"file","filename":"/dev/fdset/1","node-name":"libvirt-2-storage","read-only":true}' \
- -device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-2-storage","id":"ide0-0-0"}' \
- -add-fd set=0,fd=208,opaque=libvirt-1-storage0 \
---blockdev '{"driver":"file","filename":"/dev/fdset/0","node-name":"libvirt-1-storage","read-only":true}' \
---device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-1-storage","id":"ide0-0-1"}' \
-+-blockdev '{"driver":"file","filename":"/dev/fdset/0","node-name":"libvirt-1-storage","read-only":false,"discard":"unmap"}' \
-+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
-+-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-1-format","id":"ide0-0-1"}' \
- -audiodev '{"id":"audio1","driver":"none"}' \
- -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \
- -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-fail-validation-if-a-domain-def-has-vhostuser-passt-but-no-shared-mem.patch b/SOURCES/libvirt-qemu-fail-validation-if-a-domain-def-has-vhostuser-passt-but-no-shared-mem.patch
deleted file mode 100644
index bb933e3..0000000
--- a/SOURCES/libvirt-qemu-fail-validation-if-a-domain-def-has-vhostuser-passt-but-no-shared-mem.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From 1010499de016dd5babf375c203baa62d9799e190 Mon Sep 17 00:00:00 2001
-Message-ID: <1010499de016dd5babf375c203baa62d9799e190.1739824249.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 14 Feb 2025 13:10:19 -0500
-Subject: [PATCH] qemu: fail validation if a domain def has vhostuser/passt but
- no shared mem
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This can/should also be done for a traditional vhost-user interface
-(ie not backend type='passt') but that will be a separate change.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 70bce2e6ee7a6b738d08fa79d14342969f51668b)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/qemu/qemu_validate.c                      |  9 ++-
- ...vhostuser-passt-no-shmem.x86_64-latest.err |  1 +
- .../net-vhostuser-passt-no-shmem.xml          | 70 +++++++++++++++++++
- .../net-vhostuser-passt.x86_64-latest.args    |  2 +-
- .../net-vhostuser-passt.x86_64-latest.xml     |  3 +
- tests/qemuxmlconfdata/net-vhostuser-passt.xml |  3 +
- tests/qemuxmlconftest.c                       |  1 +
- 7 files changed, 87 insertions(+), 2 deletions(-)
- create mode 100644 tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.x86_64-latest.err
- create mode 100644 tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.xml
-
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index f33c0c07b4..289a3f94cc 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -1724,6 +1724,7 @@ qemuValidateDomainDefVhostUserRequireSharedMemory(const virDomainDef *def,
- 
- static int
- qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-+                                   const virDomainDef *def,
-                                    virQEMUCaps *qemuCaps)
- {
-     bool hasIPv4 = false;
-@@ -1804,6 +1805,12 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-         return -1;
-     }
- 
-+    if (net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER &&
-+        net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
-+        if (qemuValidateDomainDefVhostUserRequireSharedMemory(def, "interface type=\"vhostuser\" backend type=\"passt\"") < 0)
-+            return -1;
-+    }
-+
-     if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
-         if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_VHOST_VDPA)) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-@@ -5400,7 +5407,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef *dev,
- 
-     switch (dev->type) {
-     case VIR_DOMAIN_DEVICE_NET:
--        return qemuValidateDomainDeviceDefNetwork(dev->data.net, qemuCaps);
-+        return qemuValidateDomainDeviceDefNetwork(dev->data.net, def, qemuCaps);
- 
-     case VIR_DOMAIN_DEVICE_CHR:
-         return qemuValidateDomainChrDef(dev->data.chr, def, qemuCaps);
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.x86_64-latest.err b/tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.x86_64-latest.err
-new file mode 100644
-index 0000000000..274af5c722
---- /dev/null
-+++ b/tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.x86_64-latest.err
-@@ -0,0 +1 @@
-+unsupported configuration: 'interface type="vhostuser" backend type="passt"' requires shared memory
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.xml b/tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.xml
-new file mode 100644
-index 0000000000..e44c91e541
---- /dev/null
-+++ b/tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.xml
-@@ -0,0 +1,70 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219136</memory>
-+  <currentMemory unit='KiB'>219136</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='x86_64' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0' model='none'/>
-+    <controller type='ide' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <interface type='vhostuser'>
-+      <mac address='00:11:22:33:44:55'/>
-+      <ip address='172.17.2.0' family='ipv4' prefix='24'/>
-+      <ip address='2001:db8:ac10:fd01::feed' family='ipv6'/>
-+      <source dev='eth42'/>
-+      <portForward proto='tcp' address='2001:db8:ac10:fd01::1:10'>
-+        <range start='22' to='2022'/>
-+        <range start='1000' end='1050'/>
-+        <range start='1020' exclude='yes'/>
-+        <range start='1030' end='1040' exclude='yes'/>
-+      </portForward>
-+      <portForward proto='udp' address='1.2.3.4' dev='eth0'>
-+        <range start='5000' end='5020' to='6000'/>
-+        <range start='5010' end='5015' exclude='yes'/>
-+      </portForward>
-+      <portForward proto='tcp'>
-+        <range start='80'/>
-+      </portForward>
-+      <portForward proto='tcp'>
-+        <range start='443' to='344'/>
-+      </portForward>
-+      <model type='virtio'/>
-+      <backend type='passt' logFile='/var/log/loglaw.blog'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-+    </interface>
-+    <interface type='vhostuser'>
-+      <mac address='00:11:22:33:44:11'/>
-+      <backend type='passt'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-+    </interface>
-+    <interface type='vhostuser'>
-+      <mac address='00:11:22:33:44:11'/>
-+      <source dev='eth43'/>
-+      <model type='virtio'/>
-+      <backend type='passt'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-+    </interface>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <audio id='1' type='none'/>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
-index 21d78d6072..7c030d7067 100644
---- a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
-@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
- -accel tcg \
- -cpu qemu64 \
- -m size=219136k \
---object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-+-object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/pc.ram","share":true,"x-use-canonical-path-for-ramblock-id":false,"size":224395264}' \
- -overcommit mem-lock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml
-index 26aa4c8d05..a1f9366722 100644
---- a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml
-+++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.xml
-@@ -3,6 +3,9 @@
-   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-   <memory unit='KiB'>219136</memory>
-   <currentMemory unit='KiB'>219136</currentMemory>
-+  <memoryBacking>
-+    <access mode='shared'/>
-+  </memoryBacking>
-   <vcpu placement='static'>1</vcpu>
-   <os>
-     <type arch='x86_64' machine='pc'>hvm</type>
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.xml b/tests/qemuxmlconfdata/net-vhostuser-passt.xml
-index e44c91e541..71b845329b 100644
---- a/tests/qemuxmlconfdata/net-vhostuser-passt.xml
-+++ b/tests/qemuxmlconfdata/net-vhostuser-passt.xml
-@@ -3,6 +3,9 @@
-   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-   <memory unit='KiB'>219136</memory>
-   <currentMemory unit='KiB'>219136</currentMemory>
-+  <memoryBacking>
-+    <access mode='shared'/>
-+  </memoryBacking>
-   <vcpu placement='static'>1</vcpu>
-   <os>
-     <type arch='x86_64' machine='pc'>hvm</type>
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index 9603984b60..3947f508a2 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -1792,6 +1792,7 @@ mymain(void)
-     DO_TEST_CAPS_VER("net-user-passt", "7.2.0");
-     DO_TEST_CAPS_LATEST_PARSE_ERROR("net-user-slirp-portforward");
-     DO_TEST_CAPS_LATEST("net-vhostuser-passt");
-+    DO_TEST_CAPS_LATEST_PARSE_ERROR("net-vhostuser-passt-no-shmem");
-     DO_TEST_CAPS_LATEST("net-virtio");
-     DO_TEST_CAPS_LATEST("net-virtio-device");
-     DO_TEST_CAPS_LATEST("net-virtio-disable-offloads");
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-fix-order-of-VNC-TLS-config-entries.patch b/SOURCES/libvirt-qemu-fix-order-of-VNC-TLS-config-entries.patch
deleted file mode 100644
index 9591d9a..0000000
--- a/SOURCES/libvirt-qemu-fix-order-of-VNC-TLS-config-entries.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 5df4d5dc38491553e3d1e454f1cd233bda0b990a Mon Sep 17 00:00:00 2001
-Message-ID: <5df4d5dc38491553e3d1e454f1cd233bda0b990a.1755522824.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 16 Jul 2025 16:32:05 +0100
-Subject: [PATCH] qemu: fix order of VNC TLS config entries
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-For TLS config parameters, the 'verify' option always comes before the
-'secret_uuid' option, except in the VNC case which has them reversed.
-
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 845e1b5138f37dbf91e5b08b7d54d963a6ec0452)
-
-Resolves: https://issues.redhat.com/browse/RHEL-106276
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/qemu/libvirtd_qemu.aug         |  2 +-
- src/qemu/qemu.conf.in              | 12 ++++++------
- src/qemu/test_libvirtd_qemu.aug.in |  2 +-
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
-index 1377fd89cc..3f018f39a0 100644
---- a/src/qemu/libvirtd_qemu.aug
-+++ b/src/qemu/libvirtd_qemu.aug
-@@ -35,8 +35,8 @@ module Libvirtd_qemu =
-                  | bool_entry "vnc_auto_unix_socket"
-                  | bool_entry "vnc_tls"
-                  | str_entry "vnc_tls_x509_cert_dir"
--                 | str_entry "vnc_tls_x509_secret_uuid"
-                  | bool_entry "vnc_tls_x509_verify"
-+                 | str_entry "vnc_tls_x509_secret_uuid"
-                  | str_entry "vnc_password"
-                  | bool_entry "vnc_sasl"
-                  | str_entry "vnc_sasl_dir"
-diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in
-index 89c9b6b913..3365834200 100644
---- a/src/qemu/qemu.conf.in
-+++ b/src/qemu/qemu.conf.in
-@@ -101,12 +101,6 @@
- #vnc_tls_x509_cert_dir = "/etc/pki/libvirt-vnc"
- 
- 
--# Uncomment and use the following option to override the default secret
--# UUID provided in the default_tls_x509_secret_uuid parameter.
--#
--#vnc_tls_x509_secret_uuid = "00000000-0000-0000-0000-000000000000"
--
--
- # The default TLS configuration only uses certificates for the server
- # allowing the client to verify the server's identity and establish
- # an encrypted channel.
-@@ -125,6 +119,12 @@
- #vnc_tls_x509_verify = 1
- 
- 
-+# Uncomment and use the following option to override the default secret
-+# UUID provided in the default_tls_x509_secret_uuid parameter.
-+#
-+#vnc_tls_x509_secret_uuid = "00000000-0000-0000-0000-000000000000"
-+
-+
- # The default VNC password. Only 8 bytes are significant for
- # VNC passwords. This parameter is only used if the per-domain
- # XML config does not already provide a password. To allow
-diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
-index 69fdae215a..86b3844d2c 100644
---- a/src/qemu/test_libvirtd_qemu.aug.in
-+++ b/src/qemu/test_libvirtd_qemu.aug.in
-@@ -9,8 +9,8 @@ module Test_libvirtd_qemu =
- { "vnc_auto_unix_socket" = "1" }
- { "vnc_tls" = "1" }
- { "vnc_tls_x509_cert_dir" = "/etc/pki/libvirt-vnc" }
--{ "vnc_tls_x509_secret_uuid" = "00000000-0000-0000-0000-000000000000" }
- { "vnc_tls_x509_verify" = "1" }
-+{ "vnc_tls_x509_secret_uuid" = "00000000-0000-0000-0000-000000000000" }
- { "vnc_password" = "XYZ12345" }
- { "vnc_sasl" = "1" }
- { "vnc_sasl_dir" = "/some/directory/sasl2" }
--- 
-2.50.1
diff --git a/SOURCES/libvirt-qemu-fix-qemu-validation-to-forbid-guest-side-IP-address-for-type-vdpa.patch b/SOURCES/libvirt-qemu-fix-qemu-validation-to-forbid-guest-side-IP-address-for-type-vdpa.patch
deleted file mode 100644
index 6f07de1..0000000
--- a/SOURCES/libvirt-qemu-fix-qemu-validation-to-forbid-guest-side-IP-address-for-type-vdpa.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 6c7d0cc41954ed8f57dbf10dcf98396576f98922 Mon Sep 17 00:00:00 2001
-Message-ID: <6c7d0cc41954ed8f57dbf10dcf98396576f98922.1739824249.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Tue, 4 Feb 2025 16:06:18 -0500
-Subject: [PATCH] qemu: fix qemu validation to forbid guest-side IP address for
- type='vdpa'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Because all the checks for VIR_DOMAIN_NET_TYPE_VDPA were inside an
-else-if clause that was immediately followed by another else-if clause
-that forbid setting guestIP.ips or guestIP.routes, we've been allowing
-users to set guestIP.* for vdpa interfaces (but then not doing
-validation of the attributes that should have been done if we *did*
-support setting IPs for vdpa (but we don't anyway, so :shrug:.)
-
-This can be fixed by turning the vdpa else-if clause into a top-level
-if - this way vdpa interfaces will hit the "else if
-(net->guestIP.nips)" clause and reject guest-side IP address setting.
-
-Also, since there are currently *no* interface types for QEMU that
-support adding guest-side routes, we put that check by itself (I think
-it may be possible to set some guest routes for passt interfaces, but
-we don't do that)
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 6345ee60d87a6490a51a58527dc9b47e4d0264f9)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/qemu/qemu_validate.c | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index aaa056379e..9310457cb1 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -1730,6 +1730,12 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-     bool hasIPv6 = false;
-     size_t i;
- 
-+    if (net->guestIP.nroutes) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("Invalid attempt to set network interface guest-side IP route, not supported by QEMU"));
-+        return -1;
-+    }
-+
-     if (net->type == VIR_DOMAIN_NET_TYPE_USER) {
-         virDomainCapsDeviceNet netCaps = { };
- 
-@@ -1743,12 +1749,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-             return -1;
-         }
- 
--        if (net->guestIP.nroutes) {
--            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                           _("Invalid attempt to set network interface guest-side IP route, not supported by QEMU"));
--            return -1;
--        }
--
-         for (i = 0; i < net->guestIP.nips; i++) {
-             const virNetDevIPAddr *ip = net->guestIP.ips[i];
- 
-@@ -1796,7 +1796,13 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-                 }
-             }
-         }
--    } else if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
-+    } else if (net->guestIP.nips) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("Invalid attempt to set network interface guest-side IP address info, not supported by QEMU"));
-+        return -1;
-+    }
-+
-+    if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
-         if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_VHOST_VDPA)) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                            _("vDPA devices are not supported with this QEMU binary"));
-@@ -1810,10 +1816,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-                            virDomainNetModelTypeToString(net->model));
-             return -1;
-         }
--    } else if (net->guestIP.nroutes || net->guestIP.nips) {
--        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                       _("Invalid attempt to set network interface guest-side IP route and/or address info, not supported by QEMU"));
--        return -1;
-     }
- 
-     if (virDomainNetIsVirtioModel(net)) {
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-introduce-QEMU_CAPS_AMD_IOMMU.patch b/SOURCES/libvirt-qemu-introduce-QEMU_CAPS_AMD_IOMMU.patch
deleted file mode 100644
index a67fd33..0000000
--- a/SOURCES/libvirt-qemu-introduce-QEMU_CAPS_AMD_IOMMU.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-From 1910eee655456fff9f60e1a8d27e6b608a390953 Mon Sep 17 00:00:00 2001
-Message-ID: <1910eee655456fff9f60e1a8d27e6b608a390953.1752749355.git.jdenemar@redhat.com>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Wed, 12 Mar 2025 16:10:31 +0100
-Subject: [PATCH] qemu: introduce QEMU_CAPS_AMD_IOMMU
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Check for the presence of the amd-iommu device, so we can conditionalize
-probing for its properties.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 14192af47ab8eda8bb9b9eee14fd1090addbb731)
-
-https://issues.redhat.com/browse/RHEL-50560
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                         | 2 ++
- src/qemu/qemu_capabilities.h                         | 1 +
- tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml    | 1 +
- tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 +
- tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml     | 1 +
- tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml     | 1 +
- 17 files changed, 18 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 6bff55f58e..8db6d19fda 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -726,6 +726,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               /* 470 */
-               "virtio-mem-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW */
-               "blockdev-set-active", /* QEMU_CAPS_BLOCKDEV_SET_ACTIVE */
-+              "amd-iommu", /* QEMU_CAPS_AMD_IOMMU */
-     );
- 
- 
-@@ -1416,6 +1417,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
-     { "sev-snp-guest", QEMU_CAPS_SEV_SNP_GUEST },
-     { "acpi-erst", QEMU_CAPS_DEVICE_ACPI_ERST },
-     { "virtio-mem-ccw", QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW },
-+    { "amd-iommu", QEMU_CAPS_AMD_IOMMU },
- };
- 
- 
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 8de392bf0f..484d1b5f1d 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -705,6 +705,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     /* 470 */
-     QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW, /* -device virtio-mem-ccw */
-     QEMU_CAPS_BLOCKDEV_SET_ACTIVE, /* blockdev-set-active QMP command supported */
-+    QEMU_CAPS_AMD_IOMMU, /* -device amd-iommu */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-index e09b6e6e1a..8854b48a56 100644
---- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-@@ -211,6 +211,7 @@
-   <flag name='chardev-reconnect-miliseconds'/>
-   <flag name='netdev-stream-reconnect-miliseconds'/>
-   <flag name='blockdev-set-active'/>
-+  <flag name='amd-iommu'/>
-   <version>9002050</version>
-   <microcodeVersion>43100285</microcodeVersion>
-   <package>v9.2.0-1636-gffaf7f0376</package>
-diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
-index 4cd05fa7ec..c46b023c78 100644
---- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
-@@ -161,6 +161,7 @@
-   <flag name='virtio-crypto'/>
-   <flag name='usb-mtp'/>
-   <flag name='netdev.user'/>
-+  <flag name='amd-iommu'/>
-   <version>5002000</version>
-   <microcodeVersion>43100243</microcodeVersion>
-   <package>v5.2.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
-index a8897fb80b..c7f2da0de6 100644
---- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
-@@ -174,6 +174,7 @@
-   <flag name='usb-mtp'/>
-   <flag name='netdev.user'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>6000000</version>
-   <microcodeVersion>43100242</microcodeVersion>
-   <package>v6.0.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
-index 0f2995a2d3..c3792a2ba8 100644
---- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
-@@ -180,6 +180,7 @@
-   <flag name='usb-mtp'/>
-   <flag name='netdev.user'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>6001000</version>
-   <microcodeVersion>43100243</microcodeVersion>
-   <package>v6.1.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
-index 582b0e9b52..8c904abf1f 100644
---- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
-@@ -182,6 +182,7 @@
-   <flag name='usb-mtp'/>
-   <flag name='netdev.user'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>6002000</version>
-   <microcodeVersion>43100244</microcodeVersion>
-   <package>v6.2.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
-index fd317a9afa..0268960643 100644
---- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
-@@ -190,6 +190,7 @@
-   <flag name='acpi-erst'/>
-   <flag name='machine-i8042-opt'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>7000000</version>
-   <microcodeVersion>43100243</microcodeVersion>
-   <package>v7.0.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
-index 32e4e8e1bb..8c0534264c 100644
---- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
-@@ -195,6 +195,7 @@
-   <flag name='intel-iommu.dma-translation'/>
-   <flag name='machine-i8042-opt'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>7001000</version>
-   <microcodeVersion>43100244</microcodeVersion>
-   <package>v7.1.0</package>
-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 0ebcb94a31..6e2204602b 100644
---- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
-+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
-@@ -199,6 +199,7 @@
-   <flag name='intel-iommu.dma-translation'/>
-   <flag name='machine-i8042-opt'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>7002000</version>
-   <microcodeVersion>43100245</microcodeVersion>
-   <package>v7.2.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
-index 025ced01d9..6daef743bf 100644
---- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
-@@ -199,6 +199,7 @@
-   <flag name='intel-iommu.dma-translation'/>
-   <flag name='machine-i8042-opt'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>7002000</version>
-   <microcodeVersion>43100245</microcodeVersion>
-   <package>v7.2.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
-index 5f45788b77..f28b8df68e 100644
---- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
-@@ -203,6 +203,7 @@
-   <flag name='intel-iommu.dma-translation'/>
-   <flag name='machine-i8042-opt'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>8000000</version>
-   <microcodeVersion>43100244</microcodeVersion>
-   <package>v8.0.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
-index 7dee7f94c2..d6fbb11064 100644
---- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
-@@ -205,6 +205,7 @@
-   <flag name='intel-iommu.dma-translation'/>
-   <flag name='machine-i8042-opt'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>8001000</version>
-   <microcodeVersion>43100245</microcodeVersion>
-   <package>v8.1.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
-index 51e14736cd..27ecaee290 100644
---- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
-@@ -208,6 +208,7 @@
-   <flag name='intel-iommu.dma-translation'/>
-   <flag name='machine-i8042-opt'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>8002000</version>
-   <microcodeVersion>43100246</microcodeVersion>
-   <package>v8.2.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
-index 4b64547b11..452e7384c0 100644
---- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
-@@ -210,6 +210,7 @@
-   <flag name='intel-iommu.dma-translation'/>
-   <flag name='machine-i8042-opt'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>9000000</version>
-   <microcodeVersion>43100245</microcodeVersion>
-   <package>v9.0.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
-index 06600f48fb..26883bd672 100644
---- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
-@@ -208,6 +208,7 @@
-   <flag name='intel-iommu.dma-translation'/>
-   <flag name='machine-i8042-opt'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='amd-iommu'/>
-   <version>9001000</version>
-   <microcodeVersion>43100246</microcodeVersion>
-   <package>v9.1.0</package>
-diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
-index 982b7ad436..1353761fab 100644
---- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
-@@ -210,6 +210,7 @@
-   <flag name='snapshot-internal-qmp'/>
-   <flag name='chardev-reconnect-miliseconds'/>
-   <flag name='netdev-stream-reconnect-miliseconds'/>
-+  <flag name='amd-iommu'/>
-   <version>9001090</version>
-   <microcodeVersion>43100247</microcodeVersion>
-   <package>v9.2.0-rc0-42-g3428a3894c</package>
--- 
-2.50.1
diff --git a/SOURCES/libvirt-qemu-introduce-QEMU_CAPS_PCI_ID.patch b/SOURCES/libvirt-qemu-introduce-QEMU_CAPS_PCI_ID.patch
deleted file mode 100644
index 0e7d544..0000000
--- a/SOURCES/libvirt-qemu-introduce-QEMU_CAPS_PCI_ID.patch
+++ /dev/null
@@ -1,4646 +0,0 @@
-From 64af9d0b91bbb421382fd755ac7995a7b4d8e571 Mon Sep 17 00:00:00 2001
-Message-ID: <64af9d0b91bbb421382fd755ac7995a7b4d8e571.1752749355.git.jdenemar@redhat.com>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Wed, 12 Mar 2025 16:22:25 +0100
-Subject: [PATCH] qemu: introduce QEMU_CAPS_PCI_ID
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduced by QEMU commit f864a3235ea1d1d714b3cde2d9a810ea6344a7b5
-the presence of this attribute allows libvirt to specify the alias
-of the AMDVI-PCI device explicitly.
-
-(It was implicit before the introduction of this attribute)
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 33a5d9dcea59b28e9869e876536d75c748e27176)
-
-Conflicts:
-	tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-	tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
-	tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
-
-Also, the 5.2.0 replies are not present upstream because it no longer
-supports QEMU 5.2.0
-
-https://issues.redhat.com/browse/RHEL-50560
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                  |   8 ++
- src/qemu/qemu_capabilities.h                  |   1 +
- .../caps_10.0.0_x86_64.replies                | 112 ++++++++++++------
- .../caps_10.0.0_x86_64.xml                    |   1 +
- .../caps_5.2.0_x86_64.replies                 | 104 ++++++++++------
- .../caps_6.0.0_x86_64.replies                 |  98 ++++++++++-----
- .../caps_6.1.0_x86_64.replies                 | 104 ++++++++++------
- .../caps_6.2.0_x86_64.replies                 | 108 +++++++++++------
- .../caps_7.0.0_x86_64.replies                 |  86 ++++++++------
- .../caps_7.1.0_x86_64.replies                 | 108 +++++++++++------
- .../caps_7.2.0_x86_64+hvf.replies             | 108 +++++++++++------
- .../caps_7.2.0_x86_64.replies                 | 108 +++++++++++------
- .../caps_8.0.0_x86_64.replies                 |  86 ++++++++------
- .../caps_8.1.0_x86_64.replies                 | 108 +++++++++++------
- .../caps_8.2.0_x86_64.replies                 | 108 +++++++++++------
- .../caps_9.0.0_x86_64.replies                 |  86 ++++++++------
- .../caps_9.1.0_x86_64.replies                 | 108 +++++++++++------
- .../caps_9.2.0_x86_64.replies                 | 108 +++++++++++------
- 18 files changed, 1034 insertions(+), 516 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 8db6d19fda..d60d2d95cc 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -727,6 +727,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               "virtio-mem-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW */
-               "blockdev-set-active", /* QEMU_CAPS_BLOCKDEV_SET_ACTIVE */
-               "amd-iommu", /* QEMU_CAPS_AMD_IOMMU */
-+              "amd-iommu.pci-id", /* QEMU_CAPS_AMD_IOMMU_PCI_ID */
-     );
- 
- 
-@@ -1563,6 +1564,10 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlkCCW[] =
-     { "loadparm", QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM, NULL },
- };
- 
-+static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsAMDIOMMU[] = {
-+    { "pci-id", QEMU_CAPS_AMD_IOMMU_PCI_ID, NULL },
-+};
-+
- /* see documentation for virQEMUQAPISchemaPathGet for the query format */
- static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
-     { "blockdev-add/arg-type/+file/drop-cache", QEMU_CAPS_MIGRATION_FILE_DROP_CACHE },
-@@ -1728,6 +1733,9 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = {
-     { "virtio-blk-ccw", virQEMUCapsDevicePropsVirtioBlkCCW,
-       G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioBlkCCW),
-       QEMU_CAPS_VIRTIO_CCW },
-+    { "amd-iommu", virQEMUCapsDevicePropsAMDIOMMU,
-+      G_N_ELEMENTS(virQEMUCapsDevicePropsAMDIOMMU),
-+      QEMU_CAPS_AMD_IOMMU },
- };
- 
- static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 484d1b5f1d..8918e8dfc4 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -706,6 +706,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW, /* -device virtio-mem-ccw */
-     QEMU_CAPS_BLOCKDEV_SET_ACTIVE, /* blockdev-set-active QMP command supported */
-     QEMU_CAPS_AMD_IOMMU, /* -device amd-iommu */
-+    QEMU_CAPS_AMD_IOMMU_PCI_ID, /* amd-iommu.pci-id */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
-index a08546ae46..e681361c0b 100644
---- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
-@@ -31892,12 +31892,54 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pci-id",
-+      "type": "str"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -31991,7 +32033,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -31999,7 +32041,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -32078,7 +32120,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -32086,7 +32128,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -34232,12 +34274,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -34893,7 +34935,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -34901,7 +34943,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -35020,7 +35062,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -35028,7 +35070,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -35235,12 +35277,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -37824,12 +37866,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -37837,12 +37879,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -37850,12 +37892,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -39378,12 +39420,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -39477,16 +39519,16 @@
-       "capability": "mapped-ram"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -39495,11 +39537,11 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
--  "id": "libvirt-48",
-+  "id": "libvirt-49",
-   "error": {
-     "class": "GenericError",
-     "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
-@@ -39514,7 +39556,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -39915,7 +39957,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -39929,7 +39971,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -40330,7 +40372,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -40345,7 +40387,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -40857,7 +40899,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-index 8854b48a56..432d60b02b 100644
---- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-@@ -212,6 +212,7 @@
-   <flag name='netdev-stream-reconnect-miliseconds'/>
-   <flag name='blockdev-set-active'/>
-   <flag name='amd-iommu'/>
-+  <flag name='amd-iommu.pci-id'/>
-   <version>9002050</version>
-   <microcodeVersion>43100285</microcodeVersion>
-   <package>v9.2.0-1636-gffaf7f0376</package>
-diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
-index 3f5405d83e..483db03fb2 100644
---- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
-@@ -20589,12 +20589,50 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -20664,7 +20702,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -20672,7 +20710,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -20741,7 +20779,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -20749,7 +20787,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -22347,12 +22385,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -22810,7 +22848,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -22818,7 +22856,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -22903,7 +22941,7 @@
-       "type": "string"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -22911,7 +22949,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -23036,12 +23074,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -24822,12 +24860,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -24835,12 +24873,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -24848,12 +24886,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -26137,12 +26175,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -26220,16 +26258,16 @@
-       "capability": "validate-uuid"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV is not enabled in KVM"
-@@ -26244,7 +26282,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-@@ -26553,7 +26591,7 @@
-       }
-     }
-   },
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-@@ -26567,7 +26605,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -26876,7 +26914,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -26891,7 +26929,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -27200,7 +27238,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
-index 5380b322d2..36f98ae200 100644
---- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
-@@ -22363,12 +22363,50 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -22442,7 +22480,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -22450,7 +22488,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -22519,7 +22557,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -22527,7 +22565,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -24173,12 +24211,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -24625,7 +24663,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -24633,7 +24671,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -24731,7 +24769,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -24739,7 +24777,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -24884,12 +24922,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -26713,12 +26751,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -26726,12 +26764,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -26739,12 +26777,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -28052,12 +28090,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -28139,12 +28177,12 @@
-       "capability": "background-snapshot"
-     }
-   ],
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-   "execute": "query-sev-capabilities",
--  "id": "libvirt-47"
-+  "id": "libvirt-48"
- }
- 
- {
-@@ -28154,7 +28192,7 @@
-     "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
-     "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
-   },
--  "id": "libvirt-47"
-+  "id": "libvirt-48"
- }
- 
- {
-@@ -28165,7 +28203,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-@@ -28486,7 +28524,7 @@
-       }
-     }
-   },
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-@@ -28500,7 +28538,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -28821,7 +28859,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -28836,7 +28874,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -29157,7 +29195,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
-index 6fb37d63d5..97a0aeb2af 100644
---- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
-@@ -22592,12 +22592,50 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -22676,7 +22714,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -22684,7 +22722,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -22758,7 +22796,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -22766,7 +22804,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -24424,12 +24462,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -24894,7 +24932,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -24902,7 +24940,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -25005,7 +25043,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -25013,7 +25051,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -25172,12 +25210,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -27189,12 +27227,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -27202,12 +27240,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -27215,12 +27253,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -28540,12 +28578,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -28627,16 +28665,16 @@
-       "capability": "background-snapshot"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "Failed to open /dev/sev: No such file or directory"
-@@ -28651,7 +28689,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-@@ -28974,7 +29012,7 @@
-       }
-     }
-   },
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-@@ -28988,7 +29026,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -29311,7 +29349,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -29326,7 +29364,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -29649,7 +29687,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
-index b2b6bcdf0d..6d6072cab5 100644
---- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
-@@ -25740,12 +25740,50 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -25824,7 +25862,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -25832,7 +25870,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -25906,7 +25944,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -25914,7 +25952,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -27654,12 +27692,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -28142,7 +28180,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -28150,7 +28188,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -28253,7 +28291,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -28261,7 +28299,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -28425,12 +28463,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -30454,12 +30492,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -30467,12 +30505,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -30480,12 +30518,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -31805,12 +31843,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -31892,16 +31930,16 @@
-       "capability": "background-snapshot"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -31910,11 +31948,11 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
--  "id": "libvirt-48",
-+  "id": "libvirt-49",
-   "error": {
-     "class": "GenericError",
-     "desc": "SGX is not enabled in KVM"
-@@ -31929,7 +31967,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -32262,7 +32300,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -32276,7 +32314,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -32609,7 +32647,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -32624,7 +32662,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -32957,7 +32995,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
-index 1ad960c99b..16fad62b37 100644
---- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
-@@ -26276,12 +26276,28 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'example-device' not found"
-+  },
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -26360,7 +26376,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -26368,7 +26384,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -26442,7 +26458,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -26450,7 +26466,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -28206,12 +28222,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -28712,7 +28728,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -28720,7 +28736,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -28823,7 +28839,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -28831,7 +28847,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -29008,12 +29024,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -31073,12 +31089,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -31086,12 +31102,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -31099,12 +31115,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -32428,12 +32444,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -32515,16 +32531,16 @@
-       "capability": "background-snapshot"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -32533,7 +32549,7 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-@@ -32554,7 +32570,7 @@
-       }
-     ]
-   },
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-@@ -32565,7 +32581,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -32902,7 +32918,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -32916,7 +32932,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -33253,7 +33269,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -33268,7 +33284,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -33605,7 +33621,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
-index cd2116d05a..ff560438f9 100644
---- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
-@@ -26999,12 +26999,50 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -27083,7 +27121,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -27091,7 +27129,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -27165,7 +27203,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -27173,7 +27211,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -28966,12 +29004,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -29490,7 +29528,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -29498,7 +29536,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -29611,7 +29649,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -29619,7 +29657,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -29811,12 +29849,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -31755,12 +31793,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -31768,12 +31806,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -31781,12 +31819,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -33110,12 +33148,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -33205,16 +33243,16 @@
-       "capability": "postcopy-preempt"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -33223,11 +33261,11 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
--  "id": "libvirt-48",
-+  "id": "libvirt-49",
-   "error": {
-     "class": "GenericError",
-     "desc": "SGX is not enabled in KVM"
-@@ -33242,7 +33280,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -33580,7 +33618,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -33594,7 +33632,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -33932,7 +33970,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -33947,7 +33985,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -34285,7 +34323,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-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 c85be45cd1..e0a72f7ad9 100644
---- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
-+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
-@@ -27968,12 +27968,50 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -28057,7 +28095,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -28065,7 +28103,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -28144,7 +28182,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -28152,7 +28190,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -29945,12 +29983,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -30487,7 +30525,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -30495,7 +30533,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -30608,7 +30646,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -30616,7 +30654,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -30808,12 +30846,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -32752,12 +32790,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -32765,12 +32803,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -32778,12 +32816,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -34107,12 +34145,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -34202,16 +34240,16 @@
-       "capability": "postcopy-preempt"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -34220,11 +34258,11 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
--  "id": "libvirt-48",
-+  "id": "libvirt-49",
-   "error": {
-     "class": "GenericError",
-     "desc": "SGX is not enabled in KVM"
-@@ -34239,7 +34277,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -34577,7 +34615,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -34591,7 +34629,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -34929,7 +34967,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -34944,7 +34982,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -35282,7 +35320,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
-index 4b56adeafa..fd6578b1c5 100644
---- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
-@@ -27968,12 +27968,50 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -28057,7 +28095,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -28065,7 +28103,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -28144,7 +28182,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -28152,7 +28190,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -29945,12 +29983,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -30487,7 +30525,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -30495,7 +30533,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -30608,7 +30646,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -30616,7 +30654,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -30808,12 +30846,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -32752,12 +32790,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -32765,12 +32803,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -32778,12 +32816,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -34107,12 +34145,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -34202,16 +34240,16 @@
-       "capability": "postcopy-preempt"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -34220,11 +34258,11 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
--  "id": "libvirt-48",
-+  "id": "libvirt-49",
-   "error": {
-     "class": "GenericError",
-     "desc": "SGX is not enabled in KVM"
-@@ -34239,7 +34277,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -34577,7 +34615,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -34591,7 +34629,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -34929,7 +34967,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -34944,7 +34982,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -35282,7 +35320,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
-index 4cad376388..b070a5e569 100644
---- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
-@@ -29339,12 +29339,28 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'example-device' not found"
-+  },
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -29428,7 +29444,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -29436,7 +29452,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -29515,7 +29531,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -29523,7 +29539,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -31340,12 +31356,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -31961,7 +31977,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -31969,7 +31985,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -32082,7 +32098,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -32090,7 +32106,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -32282,12 +32298,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -34333,12 +34349,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -34346,12 +34362,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -34359,12 +34375,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -35805,12 +35821,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -35900,16 +35916,16 @@
-       "capability": "postcopy-preempt"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -35918,11 +35934,11 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
--  "id": "libvirt-48",
-+  "id": "libvirt-49",
-   "error": {
-     "class": "GenericError",
-     "desc": "SGX is not enabled in KVM"
-@@ -35937,7 +35953,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -36280,7 +36296,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -36294,7 +36310,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -36637,7 +36653,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -36652,7 +36668,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -37101,7 +37117,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
-index 888a5d3b6a..6f5297b470 100644
---- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
-@@ -30094,12 +30094,50 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -30188,7 +30226,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -30196,7 +30234,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -30275,7 +30313,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -30283,7 +30321,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -32180,12 +32218,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -32821,7 +32859,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -32829,7 +32867,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -32942,7 +32980,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -32950,7 +32988,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -33138,12 +33176,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -35525,12 +35563,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -35538,12 +35576,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -35551,12 +35589,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -37014,12 +37052,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -37117,16 +37155,16 @@
-       "capability": "dirty-limit"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -37135,11 +37173,11 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
--  "id": "libvirt-48",
-+  "id": "libvirt-49",
-   "error": {
-     "class": "GenericError",
-     "desc": "SGX is not enabled in KVM"
-@@ -37154,7 +37192,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -37517,7 +37555,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -37531,7 +37569,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -37894,7 +37932,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -37909,7 +37947,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -38378,7 +38416,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
-index 33e4978c38..8a3c54f915 100644
---- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
-@@ -30785,12 +30785,50 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -30884,7 +30922,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -30892,7 +30930,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -30971,7 +31009,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -30979,7 +31017,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -32892,12 +32930,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -33513,7 +33551,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -33521,7 +33559,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -33634,7 +33672,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -33642,7 +33680,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -33830,12 +33868,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -36217,12 +36255,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -36230,12 +36268,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -36243,12 +36281,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -37719,12 +37757,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -37822,16 +37860,16 @@
-       "capability": "dirty-limit"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -37840,11 +37878,11 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
--  "id": "libvirt-48",
-+  "id": "libvirt-49",
-   "error": {
-     "class": "GenericError",
-     "desc": "SGX is not enabled in KVM"
-@@ -37859,7 +37897,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -38226,7 +38264,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -38240,7 +38278,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -38607,7 +38645,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -38622,7 +38660,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -39095,7 +39133,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
-index 89fefb863b..638313f857 100644
---- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
-@@ -31003,12 +31003,28 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'example-device' not found"
-+  },
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -31102,7 +31118,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -31110,7 +31126,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -31189,7 +31205,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -31197,7 +31213,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -33114,12 +33130,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -33755,7 +33771,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -33763,7 +33779,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -33876,7 +33892,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -33884,7 +33900,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -34076,12 +34092,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -36463,12 +36479,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -36476,12 +36492,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -36489,12 +36505,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -37969,12 +37985,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -38076,16 +38092,16 @@
-       "capability": "mapped-ram"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -38094,11 +38110,11 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
--  "id": "libvirt-48",
-+  "id": "libvirt-49",
-   "error": {
-     "class": "GenericError",
-     "desc": "SGX is not enabled in KVM"
-@@ -38113,7 +38129,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -38481,7 +38497,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -38495,7 +38511,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -38863,7 +38879,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -38878,7 +38894,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -39352,7 +39368,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies
-index 4838037ee7..47575075bd 100644
---- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies
-@@ -31390,12 +31390,50 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -31489,7 +31527,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -31497,7 +31535,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -31576,7 +31614,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -31584,7 +31622,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -33633,12 +33671,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -34254,7 +34292,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -34262,7 +34300,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -34375,7 +34413,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -34383,7 +34421,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -34575,12 +34613,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -37131,12 +37169,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -37144,12 +37182,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -37157,12 +37195,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -38645,12 +38683,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -38744,16 +38782,16 @@
-       "capability": "mapped-ram"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -38762,11 +38800,11 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
--  "id": "libvirt-48",
-+  "id": "libvirt-49",
-   "error": {
-     "class": "GenericError",
-     "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
-@@ -38781,7 +38819,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -39159,7 +39197,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -39173,7 +39211,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -39551,7 +39589,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -39566,7 +39604,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -40054,7 +40092,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies
-index 92577fc8ab..b66018686f 100644
---- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies
-@@ -31726,12 +31726,50 @@
-   "id": "libvirt-35"
- }
- 
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "amd-iommu"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xtsup",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
- {
-   "execute": "qom-list-properties",
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -31825,7 +31863,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -31833,7 +31871,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -31912,7 +31950,7 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-@@ -31920,7 +31958,7 @@
-   "arguments": {
-     "typename": "max-x86_64-cpu"
-   },
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-@@ -34062,12 +34100,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -34703,7 +34741,7 @@
-       "default-ram-id": "pc.ram"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -34711,7 +34749,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -34829,7 +34867,7 @@
-       "type": "child<container>"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -34837,7 +34875,7 @@
-   "arguments": {
-     "typename": "generic-pc-machine"
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -35035,12 +35073,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-@@ -37483,12 +37521,12 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-42"
-+  "id": "libvirt-43"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-@@ -37496,12 +37534,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -37509,12 +37547,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -39007,12 +39045,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -39106,16 +39144,16 @@
-       "capability": "mapped-ram"
-     }
-   ],
--  "id": "libvirt-46"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-47"
- }
- 
- {
--  "id": "libvirt-47",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-@@ -39124,11 +39162,11 @@
- 
- {
-   "execute": "query-sgx-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
--  "id": "libvirt-48",
-+  "id": "libvirt-49",
-   "error": {
-     "class": "GenericError",
-     "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
-@@ -39143,7 +39181,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -39543,7 +39581,7 @@
-       }
-     }
-   },
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -39557,7 +39595,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -39957,7 +39995,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -39972,7 +40010,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -40483,7 +40521,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
--- 
-2.50.1
diff --git a/SOURCES/libvirt-qemu-make-passt-vhostuser-reconnect-behave-identically-to-passt-user.patch b/SOURCES/libvirt-qemu-make-passt-vhostuser-reconnect-behave-identically-to-passt-user.patch
deleted file mode 100644
index e428f5b..0000000
--- a/SOURCES/libvirt-qemu-make-passt-vhostuser-reconnect-behave-identically-to-passt-user.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 74aeb210bdbeba3389eff4f07860217dd8bb068e Mon Sep 17 00:00:00 2001
-Message-ID: <74aeb210bdbeba3389eff4f07860217dd8bb068e.1747908718.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 4 Apr 2025 19:44:52 -0400
-Subject: [PATCH] qemu: make passt+vhostuser reconnect behave identically to
- passt+user
-
-When "original passt" support was added, we decided that we always
-wanted to reconnect (i.e. restart the passt process) if it was somehow
-terminated. Generic vhost-user, on the other hand, only turns on
-reconnect if specified by the user in the config. But there is no
-reason to require the user to specify this if the other end of the
-vhost-user socket is a passt process - we know what has happened and
-what we want to do; no reason to do the *wrong* thing by default, and
-force the user to make an arbitrary decision about what to add to the
-config in order to make it do the *right* thing; instead we just
-hardcode it to always do the right thing.
-
-(NB: when the backend is passt, <interface type='vhostuser'> has
-always ignored the reconnect setting in <source> when parsing and
-formatting, just as it has always ignored the socket path (since that
-also is not user configurable for the passt backend)
-
-Resolves: https://issues.redhat.com/browse/RHEL-80169
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Tested-by: Stefano Brivio <sbrivio@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 44abaa0128ac0fc8be9de4eebc15c03809bf5867)
-
-Conflicts:
-
-tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64-latest.args:
-  This file (created by upstream commit be5332c81d28) was modified
-  upstream but doesin't exist downstream
-
-https://issues.redhat.com/browse/RHEL-80169
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/qemu/qemu_passt.c                            | 16 +++++++++++++---
- .../net-vhostuser-passt.x86_64-latest.args       |  6 +++---
- 2 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c
-index bc495eca1e..fcc34de384 100644
---- a/src/qemu/qemu_passt.c
-+++ b/src/qemu/qemu_passt.c
-@@ -36,7 +36,7 @@ VIR_LOG_INIT("qemu.passt");
- 
- 
- #define PASST "passt"
--
-+#define QEMU_PASST_RECONNECT_TIMEOUT 5
- 
- static char *
- qemuPasstCreatePidFilename(virDomainObj *vm,
-@@ -106,11 +106,15 @@ qemuPasstAddNetProps(virDomainObj *vm,
- 
-     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_STREAM_RECONNECT)) {
-         if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS)) {
--            if (virJSONValueObjectAdd(netprops, "u:reconnect-ms", 5000, NULL) < 0)
-+            if (virJSONValueObjectAdd(netprops, "u:reconnect-ms",
-+                                      QEMU_PASST_RECONNECT_TIMEOUT * 1000, NULL) < 0) {
-                 return -1;
-+            }
-         } else {
--            if (virJSONValueObjectAdd(netprops, "u:reconnect", 5, NULL) < 0)
-+            if (virJSONValueObjectAdd(netprops, "u:reconnect",
-+                                      QEMU_PASST_RECONNECT_TIMEOUT, NULL) < 0) {
-                 return -1;
-+            }
-         }
-     }
- 
-@@ -182,6 +186,12 @@ qemuPasstPrepareVhostUser(virDomainObj *vm,
-      */
-     g_free(net->data.vhostuser->data.nix.path);
-     net->data.vhostuser->data.nix.path = qemuPasstCreateSocketPath(vm, net);
-+
-+    /* reconnect is always enabled, with timeout always at 5 seconds, when
-+     * using passt
-+     */
-+    net->data.vhostuser->data.nix.reconnect.enabled = VIR_TRISTATE_BOOL_YES;
-+    net->data.vhostuser->data.nix.reconnect.timeout = QEMU_PASST_RECONNECT_TIMEOUT;
- }
- 
- int
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
-index 7c030d7067..afbbe188cf 100644
---- a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
-@@ -28,13 +28,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
- -boot strict=on \
- -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \
- -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-storage","id":"ide0-0-0","bootindex":1}' \
---chardev socket,id=charnet0,path=/var/run/libvirt/qemu/passt/-1-QEMUGuest1-net0.socket \
-+-chardev socket,id=charnet0,path=/var/run/libvirt/qemu/passt/-1-QEMUGuest1-net0.socket,reconnect-ms=5000 \
- -netdev '{"type":"vhost-user","chardev":"charnet0","id":"hostnet0"}' \
- -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \
---chardev socket,id=charnet1,path=/var/run/libvirt/qemu/passt/-1-QEMUGuest1-net1.socket \
-+-chardev socket,id=charnet1,path=/var/run/libvirt/qemu/passt/-1-QEMUGuest1-net1.socket,reconnect-ms=5000 \
- -netdev '{"type":"vhost-user","chardev":"charnet1","id":"hostnet1"}' \
- -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:11","bus":"pci.0","addr":"0x3"}' \
---chardev socket,id=charnet2,path=/var/run/libvirt/qemu/passt/-1-QEMUGuest1-net2.socket \
-+-chardev socket,id=charnet2,path=/var/run/libvirt/qemu/passt/-1-QEMUGuest1-net2.socket,reconnect-ms=5000 \
- -netdev '{"type":"vhost-user","chardev":"charnet2","id":"hostnet2"}' \
- -device '{"driver":"virtio-net-pci","netdev":"hostnet2","id":"net2","mac":"00:11:22:33:44:11","bus":"pci.0","addr":"0x4"}' \
- -audiodev '{"id":"audio1","driver":"none"}' \
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-make-processNetDevStreamDisconnectedEvent-reusable.patch b/SOURCES/libvirt-qemu-make-processNetDevStreamDisconnectedEvent-reusable.patch
deleted file mode 100644
index 533ff1e..0000000
--- a/SOURCES/libvirt-qemu-make-processNetDevStreamDisconnectedEvent-reusable.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From a34cd486d22bf36ea64a6dd14541138fcca31b37 Mon Sep 17 00:00:00 2001
-Message-ID: <a34cd486d22bf36ea64a6dd14541138fcca31b37.1747908718.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 4 Apr 2025 16:57:21 -0400
-Subject: [PATCH] qemu: make processNetDevStreamDisconnectedEvent() reusable
-
-We will be adding a new event whose response will be *exactly* the
-same as the response to NETDEV_STREAM_DISCONNECTED. Rather than doing
-a copy-paste of the complete function that does the processing, turn
-that function into something more generic that takes the name of the
-event as an arg (the event name is only used in log messages).
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Tested-by: Stefano Brivio <sbrivio@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 03a6bc7752ec73d7ea222d5386e8f4124fe51c7f)
-
-Conflicts:
-
-src/qemu/qemu_driver.c:
-  In context surrounding a chunk, the arguments to
-  processNicRxFilterChangedEvent() changed upstream (due to upstream
-  commit 50981052a5f)
-
-https://issues.redhat.com/browse/RHEL-80169
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/qemu/qemu_driver.c | 37 +++++++++++++++++++++++--------------
- 1 file changed, 23 insertions(+), 14 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 89bb10756e..3373dfb845 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -3618,8 +3618,9 @@ processDeviceDeletedEvent(virQEMUDriver *driver,
- 
- 
- static void
--processNetdevStreamDisconnectedEvent(virDomainObj *vm,
--                                     const char *netdevId)
-+processNetdevDisconnectedEvent(virDomainObj *vm,
-+                               const char *netdevId,
-+                               const char *eventName)
- {
-     virDomainDeviceDef dev;
-     virDomainNetDef *def;
-@@ -3634,13 +3635,13 @@ processNetdevStreamDisconnectedEvent(virDomainObj *vm,
-      */
- 
-     if (!devAlias) {
--        VIR_WARN("Received NETDEV_STREAM_DISCONNECTED event for unrecognized netdev %s from domain %p %s",
--                  netdevId, vm, vm->def->name);
-+        VIR_WARN("Received %s event for unrecognized netdev %s from domain %p %s",
-+                 eventName, netdevId, vm, vm->def->name);
-         return;
-     }
- 
--    VIR_DEBUG("Received NETDEV_STREAM_DISCONNECTED event for device %s from domain %p %s",
--              devAlias, vm, vm->def->name);
-+    VIR_DEBUG("Received %s event for device %s from domain %p %s",
-+              eventName, devAlias, vm, vm->def->name);
- 
-     if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0)
-         return;
-@@ -3651,28 +3652,28 @@ processNetdevStreamDisconnectedEvent(virDomainObj *vm,
-     }
- 
-     if (virDomainDefFindDevice(vm->def, devAlias, &dev, true) < 0) {
--        VIR_WARN("NETDEV_STREAM_DISCONNECTED event received for non-existent device %s in domain %s",
--                 devAlias, vm->def->name);
-+        VIR_WARN("%s event received for non-existent device %s in domain %s",
-+                 eventName, devAlias, vm->def->name);
-         goto endjob;
-     }
-     if (dev.type != VIR_DOMAIN_DEVICE_NET) {
--        VIR_WARN("NETDEV_STREAM_DISCONNECTED event received for non-network device %s in domain %s",
--                 devAlias, vm->def->name);
-+        VIR_WARN("%s event received for non-network device %s in domain %s",
-+                 eventName, devAlias, vm->def->name);
-         goto endjob;
-     }
-     def = dev.data.net;
- 
-     if (def->backend.type != VIR_DOMAIN_NET_BACKEND_PASST) {
--        VIR_DEBUG("ignore NETDEV_STREAM_DISCONNECTED event for non-passt network device %s in domain %s",
--                  def->info.alias, vm->def->name);
-+        VIR_DEBUG("ignore %s event for non-passt network device %s in domain %s",
-+                  eventName, def->info.alias, vm->def->name);
-         goto endjob;
-     }
- 
-     /* handle the event - restart the passt process with its original
-      * parameters
-      */
--    VIR_DEBUG("process NETDEV_STREAM_DISCONNECTED event for network device %s in domain %s",
--              def->info.alias, vm->def->name);
-+    VIR_DEBUG("process %s event for network device %s in domain %s",
-+              eventName, def->info.alias, vm->def->name);
- 
-     if (qemuPasstStart(vm, def) < 0)
-         goto endjob;
-@@ -3682,6 +3683,14 @@ processNetdevStreamDisconnectedEvent(virDomainObj *vm,
- }
- 
- 
-+static void
-+processNetdevStreamDisconnectedEvent(virDomainObj *vm,
-+                                     const char *netdevId)
-+{
-+    processNetdevDisconnectedEvent(vm, netdevId, "NETDEV_STREAM_DISCONNECTED");
-+}
-+
-+
- static void
- processNicRxFilterChangedEvent(virDomainObj *vm,
-                                const char *devAlias)
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-make-qemuPasstCreateSocketPath-public.patch b/SOURCES/libvirt-qemu-make-qemuPasstCreateSocketPath-public.patch
deleted file mode 100644
index 226081c..0000000
--- a/SOURCES/libvirt-qemu-make-qemuPasstCreateSocketPath-public.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3d9f51a59292b1a910b11fac00f9cb52210169d1 Mon Sep 17 00:00:00 2001
-Message-ID: <3d9f51a59292b1a910b11fac00f9cb52210169d1.1739824249.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Wed, 12 Feb 2025 12:12:04 -0500
-Subject: [PATCH] qemu: make qemuPasstCreateSocketPath() public
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When passt is used with vhostuser, the vhostuser code that builds the
-qemu commandline will need to have the same socket path that is given
-to the passt command, so this patch makes it visible outside of
-qemu_passt.c.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 7b7c56c3b81c0f525c6b2f1c89e0ef070bb4fb19)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/qemu/qemu_passt.c | 2 +-
- src/qemu/qemu_passt.h | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c
-index dd4a8bb997..8a3ac4e988 100644
---- a/src/qemu/qemu_passt.c
-+++ b/src/qemu/qemu_passt.c
-@@ -54,7 +54,7 @@ qemuPasstCreatePidFilename(virDomainObj *vm,
- }
- 
- 
--static char *
-+char *
- qemuPasstCreateSocketPath(virDomainObj *vm,
-                           virDomainNetDef *net)
- {
-diff --git a/src/qemu/qemu_passt.h b/src/qemu/qemu_passt.h
-index 623b494b7a..e0b9aaac8d 100644
---- a/src/qemu/qemu_passt.h
-+++ b/src/qemu/qemu_passt.h
-@@ -36,3 +36,6 @@ void qemuPasstStop(virDomainObj *vm,
- int qemuPasstSetupCgroup(virDomainObj *vm,
-                          virDomainNetDef *net,
-                          virCgroup *cgroup);
-+
-+char *qemuPasstCreateSocketPath(virDomainObj *vm,
-+                                virDomainNetDef *net);
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-migration-Always-offer-block-dirty-bitmaps-during-migration.patch b/SOURCES/libvirt-qemu-migration-Always-offer-block-dirty-bitmaps-during-migration.patch
new file mode 100644
index 0000000..bcb1e9c
--- /dev/null
+++ b/SOURCES/libvirt-qemu-migration-Always-offer-block-dirty-bitmaps-during-migration.patch
@@ -0,0 +1,147 @@
+From d2c2c9bf6cb12cd1bd02763410744c8322c36bdc Mon Sep 17 00:00:00 2001
+Message-ID: <d2c2c9bf6cb12cd1bd02763410744c8322c36bdc.1770203323.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 27 Jan 2026 17:00:10 +0100
+Subject: [PATCH] qemu: migration: Always offer block dirty bitmaps during
+ migration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Until now block dirty bitmaps were offered to destination only if
+non-shared storage migration was enabled.
+
+Upcoming patches will want to support it also in cases when storage is
+shared but the destination has a qcow2 overlay using the 'data_file'
+feature where the qcow2 overlay is not actually shared.
+
+To support that we'll now always offer bitmaps for migration. The
+destination can then decide (using existing logic) to pick only the
+ones that are not present in the image on destination, which is how
+it was supposed to work even now.
+
+The patch removes all the flag checks and simply offers bitmaps in any
+case. The overhead incurred by this is one 'query-named-block-nodes'
+call to qemu.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit a4f610ff3fe190058f18baea18b095d0bc69441b)
+
+https://issues.redhat.com/browse/RHEL-145769 [rhel-10.2]
+https://issues.redhat.com/browse/RHEL-145770 [rhel-9.8]
+---
+ src/qemu/qemu_migration.c | 28 +++++++---------------------
+ 1 file changed, 7 insertions(+), 21 deletions(-)
+
+diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
+index 723e131c98..755b9a5e1a 100644
+--- a/src/qemu/qemu_migration.c
++++ b/src/qemu/qemu_migration.c
+@@ -2580,16 +2580,13 @@ qemuMigrationAnyConnectionClosed(virDomainObj *vm,
+  * qemuMigrationSrcBeginPhaseBlockDirtyBitmaps:
+  * @mig: migration cookie struct
+  * @vm: domain object
+- * @migrate_disks: disks which are being migrated
+- * @nmigrage_disks: number of @migrate_disks
+  *
+  * Enumerates block dirty bitmaps on disks which will undergo storage migration
+  * and fills them into @mig to be offered to the destination.
+  */
+ static int
+ qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(qemuMigrationCookie *mig,
+-                                            virDomainObj *vm,
+-                                            const char **migrate_disks)
++                                            virDomainObj *vm)
+ 
+ {
+     GSList *disks = NULL;
+@@ -2611,9 +2608,6 @@ qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(qemuMigrationCookie *mig,
+         if (!nodedata)
+             continue;
+ 
+-        if (!qemuMigrationAnyCopyDisk(diskdef, migrate_disks))
+-            continue;
+-
+         for (j = 0; j < nodedata->nbitmaps; j++) {
+             qemuMigrationBlockDirtyBitmapsDiskBitmap *bitmap;
+ 
+@@ -2680,7 +2674,6 @@ qemuMigrationSrcBeginXML(virDomainObj *vm,
+                          char **cookieout,
+                          int *cookieoutlen,
+                          unsigned int cookieFlags,
+-                         const char **migrate_disks,
+                          unsigned int flags)
+ {
+     qemuDomainObjPrivate *priv = vm->privateData;
+@@ -2696,8 +2689,7 @@ qemuMigrationSrcBeginXML(virDomainObj *vm,
+     if (!(mig = qemuMigrationCookieNew(vm->def, priv->origname)))
+         return NULL;
+ 
+-    if (cookieFlags & QEMU_MIGRATION_COOKIE_NBD &&
+-        qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(mig, vm, migrate_disks) < 0)
++    if (qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(mig, vm) < 0)
+         return NULL;
+ 
+     if (qemuMigrationCookieFormat(mig, driver, vm,
+@@ -2879,8 +2871,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver,
+         return NULL;
+ 
+     return qemuMigrationSrcBeginXML(vm, xmlin,
+-                                    cookieout, cookieoutlen, cookieFlags,
+-                                    migrate_disks, flags);
++                                    cookieout, cookieoutlen, cookieFlags, flags);
+ }
+ 
+ 
+@@ -2969,8 +2960,7 @@ qemuMigrationSrcBeginResume(virDomainObj *vm,
+         return NULL;
+     }
+ 
+-    return qemuMigrationSrcBeginXML(vm, xmlin,
+-                                    cookieout, cookieoutlen, 0, NULL, flags);
++    return qemuMigrationSrcBeginXML(vm, xmlin, cookieout, cookieoutlen, 0, flags);
+ }
+ 
+ 
+@@ -4752,7 +4742,6 @@ qemuMigrationSrcRunPrepareBlockDirtyBitmaps(virDomainObj *vm,
+ 
+     /* For VIR_MIGRATE_NON_SHARED_INC we can migrate the bitmaps directly,
+      * otherwise we must create merged bitmaps from the whole chain */
+-
+     if (!(flags & VIR_MIGRATE_NON_SHARED_INC) &&
+         qemuMigrationSrcRunPrepareBlockDirtyBitmapsMerge(vm, mig) < 0)
+         return -1;
+@@ -4943,7 +4932,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
+     VIR_AUTOCLOSE fd = -1;
+     unsigned long restore_max_bandwidth = priv->migMaxBandwidth;
+     virErrorPtr orig_err = NULL;
+-    unsigned int cookieFlags = 0;
++    unsigned int cookieFlags = QEMU_MIGRATION_COOKIE_BLOCK_DIRTY_BITMAPS;
+     bool abort_on_error = !!(flags & VIR_MIGRATE_ABORT_ON_ERROR);
+     bool storageMigration = flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC);
+     bool cancel = false;
+@@ -4967,10 +4956,8 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
+         storageMigration = qemuMigrationHasAnyStorageMigrationDisks(vm->def,
+                                                                     migrate_disks);
+ 
+-    if (storageMigration) {
++    if (storageMigration)
+         cookieFlags |= QEMU_MIGRATION_COOKIE_NBD;
+-        cookieFlags |= QEMU_MIGRATION_COOKIE_BLOCK_DIRTY_BITMAPS;
+-    }
+ 
+     if (virLockManagerPluginUsesState(driver->lockManager) &&
+         !cookieout) {
+@@ -5004,8 +4991,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
+                                    cookiein, cookieinlen,
+                                    cookieFlags |
+                                    QEMU_MIGRATION_COOKIE_GRAPHICS |
+-                                   QEMU_MIGRATION_COOKIE_CAPS |
+-                                   QEMU_MIGRATION_COOKIE_BLOCK_DIRTY_BITMAPS);
++                                   QEMU_MIGRATION_COOKIE_CAPS);
+     if (!mig)
+         goto error;
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemu-migration-Reactivate-block-nodes-after-migration-if-VM-is-left-paused.patch b/SOURCES/libvirt-qemu-migration-Reactivate-block-nodes-after-migration-if-VM-is-left-paused.patch
deleted file mode 100644
index eb5529b..0000000
--- a/SOURCES/libvirt-qemu-migration-Reactivate-block-nodes-after-migration-if-VM-is-left-paused.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 64a914839cf44c7ed309fb827ab40c94dcb7c0d0 Mon Sep 17 00:00:00 2001
-Message-ID: <64a914839cf44c7ed309fb827ab40c94dcb7c0d0.1739824249.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 10 Feb 2025 19:49:10 +0100
-Subject: [PATCH] qemu: migration: Reactivate block nodes after migration if VM
- is left paused
-
-On incoming migration qemu doesn't activate the block graph nodes right
-away. This is to properly facilitate locking of the images.
-
-The block nodes are normally re-activated when starting the CPUs after
-migration, but in cases (e.g. when a paused VM was migrated) when the VM
-is left paused the block nodes are not re-activated by qemu.
-
-This means that blockjobs which would want to write to an existing
-backing chain member would fail. Generally read-only jobs would succeed
-with older qemu's but this was not intended.
-
-Instead with new qemu you'll always get an error if attempting to access
-a inactive node:
-
- error: internal error: unable to execute QEMU command 'blockdev-mirror': Inactive 'libvirt-1-storage' can't be a backing child of active '#block052'
-
-This is the case for explicit blockjobs (virsh blockcopy) but also for
-non shared-storage migration (virsh migrate --copy-storage-all).
-
-Since qemu now provides 'blockdev-set-active' QMP command which can
-on-demand re-activate the nodes we can re-activate them in similar cases
-as when we'd be starting vCPUs if the VM weren't left paused.
-
-The only exception is on the source in case of a failed post-copy
-migration as the VM already ran on destination so it won't ever run on
-the source even when recovered.
-
-Resolves: https://issues.redhat.com/browse/RHEL-78398
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 2626fa0569781c0f42db247f4b7116c33cd88b43)
-
-https://issues.redhat.com/browse/RHEL-79095
----
- src/qemu/qemu_migration.c | 55 ++++++++++++++++++++++++++++++++++++---
- 1 file changed, 52 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 4112e95a1e..62da892254 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -220,6 +220,43 @@ qemuMigrationSrcStoreDomainState(virDomainObj *vm)
- }
- 
- 
-+/**
-+ * qemuMigrationBlockNodesReactivate:
-+ *
-+ * In case when we're keeping the VM paused qemu will not re-activate the block
-+ * device backend tree so blockjobs would fail. In case when qemu supports the
-+ * 'blockdev-set-active' command this function will re-activate the block nodes.
-+ */
-+static void
-+qemuMigrationBlockNodesReactivate(virDomainObj *vm,
-+                                  virDomainAsyncJob asyncJob)
-+{
-+    virErrorPtr orig_err;
-+    qemuDomainObjPrivate *priv = vm->privateData;
-+    int rc;
-+
-+    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_SET_ACTIVE))
-+        return;
-+
-+    VIR_DEBUG("re-activating block nodes");
-+
-+    virErrorPreserveLast(&orig_err);
-+
-+    if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0)
-+        goto cleanup;
-+
-+    rc = qemuMonitorBlockdevSetActive(priv->mon, NULL, true);
-+
-+    qemuDomainObjExitMonitor(vm);
-+
-+    if (rc < 0)
-+        VIR_WARN("failed to re-activate block nodes after migration of VM '%s'", vm->def->name);
-+
-+ cleanup:
-+    virErrorRestore(&orig_err);
-+}
-+
-+
- static void
- qemuMigrationSrcRestoreDomainState(virQEMUDriver *driver, virDomainObj *vm)
- {
-@@ -236,14 +273,17 @@ qemuMigrationSrcRestoreDomainState(virQEMUDriver *driver, virDomainObj *vm)
-               virDomainStateTypeToString(state),
-               virDomainStateReasonToString(state, reason));
- 
--    if (preMigrationState != VIR_DOMAIN_RUNNING ||
--        state != VIR_DOMAIN_PAUSED ||
-+    if (state == VIR_DOMAIN_PAUSED &&
-         reason == VIR_DOMAIN_PAUSED_POSTCOPY_FAILED)
-         return;
- 
-+    if (preMigrationState != VIR_DOMAIN_RUNNING ||
-+        state != VIR_DOMAIN_PAUSED)
-+        goto reactivate;
-+
-     if (reason == VIR_DOMAIN_PAUSED_IOERROR) {
-         VIR_DEBUG("Domain is paused due to I/O error, skipping resume");
--        return;
-+        goto reactivate;
-     }
- 
-     VIR_DEBUG("Restoring pre-migration state due to migration error");
-@@ -266,7 +306,14 @@ qemuMigrationSrcRestoreDomainState(virQEMUDriver *driver, virDomainObj *vm)
-                                                       VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
-             virObjectEventStateQueue(driver->domainEventState, event);
-         }
-+
-+        goto reactivate;
-     }
-+
-+    return;
-+
-+ reactivate:
-+    qemuMigrationBlockNodesReactivate(vm, VIR_ASYNC_JOB_MIGRATION_OUT);
- }
- 
- 
-@@ -6781,6 +6828,8 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver,
- 
-         if (*inPostCopy)
-             *doKill = false;
-+    } else {
-+        qemuMigrationBlockNodesReactivate(vm, VIR_ASYNC_JOB_MIGRATION_IN);
-     }
- 
-     if (mig->jobData) {
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-monitor-Add-handlers-for-block-latency-histogram-set.patch b/SOURCES/libvirt-qemu-monitor-Add-handlers-for-block-latency-histogram-set.patch
new file mode 100644
index 0000000..c29cb60
--- /dev/null
+++ b/SOURCES/libvirt-qemu-monitor-Add-handlers-for-block-latency-histogram-set.patch
@@ -0,0 +1,182 @@
+From 89c7b98a54f15b1042ac0ffc6270c0d01133e501 Mon Sep 17 00:00:00 2001
+Message-ID: <89c7b98a54f15b1042ac0ffc6270c0d01133e501.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 11 Dec 2025 18:38:12 +0100
+Subject: [PATCH] qemu: monitor: Add handlers for 'block-latency-histogram-set'
+
+Add QMP monitor code for setting up latency histogram configuration.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit ad4830ce6844b75800685ea85b15a53b8dbc5ac6)
+
+https://issues.redhat.com/browse/RHEL-147866 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-131335 [rhel-10.2]
+---
+ src/qemu/qemu_monitor.c      | 21 +++++++++++++
+ src/qemu/qemu_monitor.h      |  9 ++++++
+ src/qemu/qemu_monitor_json.c | 60 ++++++++++++++++++++++++++++++++++++
+ src/qemu/qemu_monitor_json.h |  9 ++++++
+ tests/qemumonitorjsontest.c  |  9 ++++++
+ 5 files changed, 108 insertions(+)
+
+diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
+index cdd08004fb..3d7477c01c 100644
+--- a/src/qemu/qemu_monitor.c
++++ b/src/qemu/qemu_monitor.c
+@@ -4612,3 +4612,24 @@ qemuMonitorBlockdevSetActive(qemuMonitor *mon,
+ 
+     return qemuMonitorJSONBlockdevSetActive(mon, nodename, active);
+ }
++
++
++int
++qemuMonitorBlockLatencyHistogramSet(qemuMonitor *mon,
++                                    const char *id,
++                                    unsigned int *boundaries,
++                                    unsigned int *boundaries_read,
++                                    unsigned int *boundaries_write,
++                                    unsigned int *boundaries_zone,
++                                    unsigned int *boundaries_flush)
++{
++    QEMU_CHECK_MONITOR(mon);
++    VIR_DEBUG("id='%s'", id);
++
++    return qemuMonitorJSONBlockLatencyHistogramSet(mon, id,
++                                                   boundaries,
++                                                   boundaries_read,
++                                                   boundaries_write,
++                                                   boundaries_zone,
++                                                   boundaries_flush);
++}
+diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
+index 238f7be875..bbe400003a 100644
+--- a/src/qemu/qemu_monitor.h
++++ b/src/qemu/qemu_monitor.h
+@@ -1988,3 +1988,12 @@ int
+ qemuMonitorBlockdevSetActive(qemuMonitor *mon,
+                              const char *nodename,
+                              bool active);
++
++int
++qemuMonitorBlockLatencyHistogramSet(qemuMonitor *mon,
++                                    const char *id,
++                                    unsigned int *boundaries,
++                                    unsigned int *boundaries_read,
++                                    unsigned int *boundaries_write,
++                                    unsigned int *boundaries_zone,
++                                    unsigned int *boundaries_flush);
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index edeea22ee0..45f690d9e2 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -9130,3 +9130,63 @@ qemuMonitorJSONBlockdevSetActive(qemuMonitor *mon,
+ 
+     return qemuMonitorJSONCheckError(cmd, reply);
+ }
++
++
++static virJSONValue *
++qemuMonitorJSONBlockLatencyHistogramBoundary(unsigned int *bound)
++{
++    g_autoptr(virJSONValue) ret = virJSONValueNewArray();
++
++    if (!bound)
++        return NULL;
++
++    for (; *bound > 0; bound++) {
++        g_autoptr(virJSONValue) val = virJSONValueNewNumberUint(*bound);
++
++        /* the only error is if the first argument is not an array */
++        ignore_value(virJSONValueArrayAppend(ret, &val));
++    }
++
++    return g_steal_pointer(&ret);
++}
++
++
++int
++qemuMonitorJSONBlockLatencyHistogramSet(qemuMonitor *mon,
++                                        const char *id,
++                                        unsigned int *boundaries,
++                                        unsigned int *boundaries_read,
++                                        unsigned int *boundaries_write,
++                                        unsigned int *boundaries_zone,
++                                        unsigned int *boundaries_flush)
++{
++    g_autoptr(virJSONValue) cmd = NULL;
++    g_autoptr(virJSONValue) reply = NULL;
++
++    g_autoptr(virJSONValue) bound = NULL;
++    g_autoptr(virJSONValue) bound_read = NULL;
++    g_autoptr(virJSONValue) bound_write = NULL;
++    g_autoptr(virJSONValue) bound_zone = NULL;
++    g_autoptr(virJSONValue) bound_flush = NULL;
++
++    bound = qemuMonitorJSONBlockLatencyHistogramBoundary(boundaries);
++    bound_read = qemuMonitorJSONBlockLatencyHistogramBoundary(boundaries_read);
++    bound_write = qemuMonitorJSONBlockLatencyHistogramBoundary(boundaries_write);
++    bound_zone = qemuMonitorJSONBlockLatencyHistogramBoundary(boundaries_zone);
++    bound_flush = qemuMonitorJSONBlockLatencyHistogramBoundary(boundaries_flush);
++
++    if (!(cmd = qemuMonitorJSONMakeCommand("block-latency-histogram-set",
++                                           "s:id", id,
++                                           "A:boundaries", &bound,
++                                           "A:boundaries-read", &bound_read,
++                                           "A:boundaries-write", &bound_write,
++                                           "A:boundaries-zap", &bound_zone,
++                                           "A:boundaries-flush", &bound_flush,
++                                           NULL)))
++        return -1;
++
++    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
++        return -1;
++
++    return qemuMonitorJSONCheckError(cmd, reply);
++}
+diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
+index db9160eb68..b418f70048 100644
+--- a/src/qemu/qemu_monitor_json.h
++++ b/src/qemu/qemu_monitor_json.h
+@@ -815,3 +815,12 @@ int
+ qemuMonitorJSONBlockdevSetActive(qemuMonitor *mon,
+                                  const char *nodename,
+                                  bool active);
++
++int
++qemuMonitorJSONBlockLatencyHistogramSet(qemuMonitor *mon,
++                                        const char *id,
++                                        unsigned int *boundaries,
++                                        unsigned int *boundaries_read,
++                                        unsigned int *boundaries_write,
++                                        unsigned int *boundaries_zone,
++                                        unsigned int *boundaries_flush);
+diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
+index bfe81739a7..1c1aaaa586 100644
+--- a/tests/qemumonitorjsontest.c
++++ b/tests/qemumonitorjsontest.c
+@@ -1130,6 +1130,14 @@ GEN_TEST_FUNC(qemuMonitorJSONSetAction,
+ GEN_TEST_FUNC(qemuMonitorJSONSetLaunchSecurityState, "sev_secret_header",
+               "sev_secret", 0, true)
+ 
++unsigned int testHistogramBoundaries[] = {10, 30, 50, 0};
++GEN_TEST_FUNC(qemuMonitorJSONBlockLatencyHistogramSet, "devid",
++              testHistogramBoundaries,
++              testHistogramBoundaries,
++              testHistogramBoundaries,
++              testHistogramBoundaries,
++              testHistogramBoundaries)
++
+ static int
+ testQemuMonitorJSONqemuMonitorJSONNBDServerStart(const void *opaque)
+ {
+@@ -2958,6 +2966,7 @@ mymain(void)
+     DO_TEST_GEN(qemuMonitorJSONBlockJobCancel);
+     DO_TEST_GEN(qemuMonitorJSONSetAction);
+     DO_TEST_GEN(qemuMonitorJSONSetLaunchSecurityState);
++    DO_TEST_GEN(qemuMonitorJSONBlockLatencyHistogramSet);
+     DO_TEST(qemuMonitorJSONGetBalloonInfo);
+     DO_TEST(qemuMonitorJSONGetBlockInfo);
+     DO_TEST(qemuMonitorJSONGetAllBlockStatsInfo);
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-monitor-Add-monitor-backend-for-blockdev-set-active.patch b/SOURCES/libvirt-qemu-monitor-Add-monitor-backend-for-blockdev-set-active.patch
deleted file mode 100644
index d74c514..0000000
--- a/SOURCES/libvirt-qemu-monitor-Add-monitor-backend-for-blockdev-set-active.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 662a2be65c232cf811e3b7618bb51a32c3c74ad6 Mon Sep 17 00:00:00 2001
-Message-ID: <662a2be65c232cf811e3b7618bb51a32c3c74ad6.1739824249.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 10 Feb 2025 17:51:31 +0100
-Subject: [PATCH] qemu: monitor: Add monitor backend for 'blockdev-set-active'
-
-The command will be used to re-activate block nodes after migration when
-we're leaving the VM paused so that blockjobs can be used.
-
-As the 'node-name' field is optional the 'qemumonitorjsontest' case
-tests both variants.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit d8f9cfb5e45111da0bd39f334f0643c0ab22ef49)
-
-https://issues.redhat.com/browse/RHEL-79095
----
- src/qemu/qemu_monitor.c      | 21 +++++++++++++++++++++
- src/qemu/qemu_monitor.h      |  5 +++++
- src/qemu/qemu_monitor_json.c | 21 +++++++++++++++++++++
- src/qemu/qemu_monitor_json.h |  5 +++++
- tests/qemumonitorjsontest.c  | 31 +++++++++++++++++++++++++++++++
- 5 files changed, 83 insertions(+)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 79ff4e2e87..82aa1cbc5f 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -4555,3 +4555,24 @@ qemuMonitorDisplayReload(qemuMonitor *mon,
- 
-     return qemuMonitorJSONDisplayReload(mon, type, tlsCerts);
- }
-+
-+
-+/**
-+ * qemuMonitorBlockdevSetActive:
-+ * @mon: monitor object
-+ * @nodename: optional nodename to (de)activate
-+ * @active: requested state
-+ *
-+ * Activate or deactivate @nodename based on @active. If @nodename is NULL,
-+ * qemu will act on all block nodes.
-+ */
-+int
-+qemuMonitorBlockdevSetActive(qemuMonitor *mon,
-+                             const char *nodename,
-+                             bool active)
-+{
-+    QEMU_CHECK_MONITOR(mon);
-+    VIR_DEBUG("nodename='%s', active='%d'", NULLSTR(nodename), active);
-+
-+    return qemuMonitorJSONBlockdevSetActive(mon, nodename, active);
-+}
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index a4818a6aa1..672cd6487e 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -1650,3 +1650,8 @@ qemuMonitorSnapshotDelete(qemuMonitor *mon,
-                           const char *jobname,
-                           const char *snapshotname,
-                           const char **disks);
-+
-+int
-+qemuMonitorBlockdevSetActive(qemuMonitor *mon,
-+                             const char *nodename,
-+                             bool active);
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 53648dea8b..6f9f495888 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -8831,3 +8831,24 @@ qemuMonitorJSONSnapshotDelete(qemuMonitor *mon,
- 
-     return qemuMonitorJSONCheckError(cmd, reply);
- }
-+
-+
-+int
-+qemuMonitorJSONBlockdevSetActive(qemuMonitor *mon,
-+                                 const char *nodename,
-+                                 bool active)
-+{
-+    g_autoptr(virJSONValue) cmd = NULL;
-+    g_autoptr(virJSONValue) reply = NULL;
-+
-+    if (!(cmd = qemuMonitorJSONMakeCommand("blockdev-set-active",
-+                                           "S:node-name", nodename,
-+                                           "b:active", active,
-+                                           NULL)))
-+        return -1;
-+
-+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-+        return -1;
-+
-+    return qemuMonitorJSONCheckError(cmd, reply);
-+}
-diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
-index 0214e9e9ff..68f60aec61 100644
---- a/src/qemu/qemu_monitor_json.h
-+++ b/src/qemu/qemu_monitor_json.h
-@@ -816,3 +816,8 @@ qemuMonitorJSONSnapshotDelete(qemuMonitor *mon,
-                               const char *jobname,
-                               const char *snapshotname,
-                               const char **disks);
-+
-+int
-+qemuMonitorJSONBlockdevSetActive(qemuMonitor *mon,
-+                                 const char *nodename,
-+                                 bool active);
-diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
-index f7fe0fb6f4..f0f6a329c8 100644
---- a/tests/qemumonitorjsontest.c
-+++ b/tests/qemumonitorjsontest.c
-@@ -1249,6 +1249,36 @@ testQemuMonitorJSONqemuMonitorJSONSnapshot(const void *opaque)
- }
- 
- 
-+static int
-+testQemuMonitorJSONqemuMonitorJSONBlockdevSetActive(const void *opaque)
-+{
-+    const testGenericData *data = opaque;
-+    virDomainXMLOption *xmlopt = data->xmlopt;
-+    g_autoptr(qemuMonitorTest) test = NULL;
-+
-+    if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
-+        return -1;
-+
-+    if (qemuMonitorTestAddItem(test, "blockdev-set-active",
-+                               "{\"return\":{}}") < 0)
-+        return -1;
-+
-+    if (qemuMonitorTestAddItem(test, "blockdev-set-active",
-+                               "{\"return\":{}}") < 0)
-+        return -1;
-+
-+    if (qemuMonitorJSONBlockdevSetActive(qemuMonitorTestGetMonitor(test),
-+                                         NULL, true) < 0)
-+        return -1;
-+
-+    if (qemuMonitorJSONBlockdevSetActive(qemuMonitorTestGetMonitor(test),
-+                                         "testnode", false) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- static bool
- testQemuMonitorJSONqemuMonitorJSONQueryCPUsEqual(struct qemuMonitorQueryCpusEntry *a,
-                                                  struct qemuMonitorQueryCpusEntry *b)
-@@ -2989,6 +3019,7 @@ mymain(void)
-     DO_TEST(qemuMonitorJSONSendKeyHoldtime);
-     DO_TEST(qemuMonitorJSONNBDServerStart);
-     DO_TEST(qemuMonitorJSONSnapshot);
-+    DO_TEST(qemuMonitorJSONBlockdevSetActive);
- 
-     DO_TEST_CPU_DATA("host");
-     DO_TEST_CPU_DATA("full");
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-monitor-Detect-list-of-bitmaps-from-qcow2-format-specific-data.patch b/SOURCES/libvirt-qemu-monitor-Detect-list-of-bitmaps-from-qcow2-format-specific-data.patch
new file mode 100644
index 0000000..120844d
--- /dev/null
+++ b/SOURCES/libvirt-qemu-monitor-Detect-list-of-bitmaps-from-qcow2-format-specific-data.patch
@@ -0,0 +1,173 @@
+From 94768f63a02ec5e9f25cb5db28b38ed6950c1df0 Mon Sep 17 00:00:00 2001
+Message-ID: <94768f63a02ec5e9f25cb5db28b38ed6950c1df0.1770203323.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 27 Jan 2026 20:07:32 +0100
+Subject: [PATCH] qemu: monitor: Detect list of bitmaps from 'qcow2' format
+ specific data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We currently probe dirty block tracking bitmaps by looking at the loaded
+ones ('dirty-bitmaps'). Unfortunately those may not yet be populated on
+incoming migration when the image was not yet activated, but we need to
+know which ones are stored in the image so that we don't migrate those
+explicitly, which would fail.
+
+Load the list of bitmaps in a qcow2 image from the format specific data,
+which is already loaded at that point.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit b2fe3465de1db033e436f38fdd24648c8c884a3d)
+
+https://issues.redhat.com/browse/RHEL-145769 [rhel-10.2]
+https://issues.redhat.com/browse/RHEL-145770 [rhel-9.8]
+---
+ src/qemu/qemu_monitor.h                      |  4 ++++
+ src/qemu/qemu_monitor_json.c                 | 17 +++++++++++++++++
+ tests/qemublocktest.c                        | 11 +++++++++++
+ tests/qemublocktestdata/bitmap/snapshots.out |  5 +++++
+ tests/qemublocktestdata/bitmap/synthetic.out |  4 ++++
+ 5 files changed, 41 insertions(+)
+
+diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
+index d096f474c1..041aa7bc12 100644
+--- a/src/qemu/qemu_monitor.h
++++ b/src/qemu/qemu_monitor.h
+@@ -893,8 +893,12 @@ struct _qemuBlockNamedNodeData {
+     unsigned long long capacity;
+     unsigned long long physical;
+ 
++    /* Information about change block tracking bitmaps which are active and loaded */
+     qemuBlockNamedNodeDataBitmap **bitmaps;
+     size_t nbitmaps;
++    /* With qcow2 we have also a separate list of bitmaps present in the image
++     * but not yet activated, which happens when starting qemu during migration */
++    char **qcow2bitmaps;
+ 
+     /* hash table indexed by snapshot name containing data about snapshots
+      * (qemuBlockNamedNodeDataSnapshot) */
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index 494d7ef515..401a28ff9a 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -2730,6 +2730,7 @@ qemuMonitorJSONBlockNamedNodeDataFree(qemuBlockNamedNodeData *data)
+         qemuMonitorJSONBlockNamedNodeDataBitmapFree(data->bitmaps[i]);
+     g_clear_pointer(&data->snapshots, g_hash_table_unref);
+     g_free(data->bitmaps);
++    g_strfreev(data->qcow2bitmaps);
+     g_free(data);
+ }
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockNamedNodeData, qemuMonitorJSONBlockNamedNodeDataFree);
+@@ -2854,6 +2855,9 @@ qemuMonitorJSONBlockGetNamedNodeDataWorker(size_t pos G_GNUC_UNUSED,
+         virJSONValue *qcow2props = virJSONValueObjectGetObject(format_specific, "data");
+ 
+         if (qcow2props) {
++            virJSONValue *bmp;
++            size_t nbmp;
++
+             if (STREQ_NULLABLE(virJSONValueObjectGetString(qcow2props, "compat"), "0.10"))
+                 ent->qcow2v2 = true;
+ 
+@@ -2862,6 +2866,19 @@ qemuMonitorJSONBlockGetNamedNodeDataWorker(size_t pos G_GNUC_UNUSED,
+ 
+             ignore_value(virJSONValueObjectGetBoolean(qcow2props, "data-file-raw",
+                                                       &ent->qcow2dataFileRaw));
++
++            if ((bmp = virJSONValueObjectGetArray(qcow2props, "bitmaps")) &&
++                ((nbmp = virJSONValueArraySize(bmp)) > 0)) {
++                size_t i;
++
++                ent->qcow2bitmaps = g_new0(char *, nbmp + 1);
++
++                for (i = 0; i < nbmp; i++) {
++                    virJSONValue *b = virJSONValueArrayGet(bmp, i);
++
++                    ent->qcow2bitmaps[i] = g_strdup(virJSONValueObjectGetString(b, "name"));
++                }
++            }
+         }
+     }
+ 
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 51d9268cdd..18ec90edf5 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -600,6 +600,17 @@ testQemuDetectBitmapsWorker(void *payload,
+                           bitmap->granularity, bitmap->dirtybytes);
+     }
+ 
++    if (data->qcow2bitmaps) {
++        char **b;
++
++        virBufferAddLit(buf, "qcow2 bitmaps:");
++
++        for (b = data->qcow2bitmaps; *b; b++)
++            virBufferAsprintf(buf, " %s", *b);
++
++        virBufferAddLit(buf, "\n");
++    }
++
+     if (data->snapshots) {
+         g_autofree virHashKeyValuePair *snaps = virHashGetItems(data->snapshots, NULL, true);
+         virHashKeyValuePair *n;
+diff --git a/tests/qemublocktestdata/bitmap/snapshots.out b/tests/qemublocktestdata/bitmap/snapshots.out
+index 29c586be7e..dedd77465c 100644
+--- a/tests/qemublocktestdata/bitmap/snapshots.out
++++ b/tests/qemublocktestdata/bitmap/snapshots.out
+@@ -4,21 +4,26 @@ libvirt-1-format:
+         b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+   current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++ qcow2 bitmaps: current c b a d
+ libvirt-1-storage:
+ libvirt-2-format:
+         c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         d: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++ qcow2 bitmaps: d a b c
+ libvirt-2-storage:
+ libvirt-3-format:
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++ qcow2 bitmaps: c b a
+ libvirt-3-storage:
+ libvirt-4-format:
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++ qcow2 bitmaps: a
+ libvirt-4-storage:
+ libvirt-5-format:
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++ qcow2 bitmaps: a
+ libvirt-5-storage:
+diff --git a/tests/qemublocktestdata/bitmap/synthetic.out b/tests/qemublocktestdata/bitmap/synthetic.out
+index 2f4ae2b217..0a47a90107 100644
+--- a/tests/qemublocktestdata/bitmap/synthetic.out
++++ b/tests/qemublocktestdata/bitmap/synthetic.out
+@@ -6,17 +6,21 @@ libvirt-1-format:
+  top-inactive: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+  top-transient: record:1 busy:0 persist:0 inconsist:0 gran:65536 dirty:0
+  top-transient-inactive: record:0 busy:0 persist:0 inconsist:0 gran:65536 dirty:0
++ qcow2 bitmaps: current
+ libvirt-1-storage:
+ libvirt-2-format:
+         d: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++ qcow2 bitmaps: d
+ libvirt-2-storage:
+ libvirt-3-format:
+         b: record:1 busy:0 persist:0 inconsist:0 gran:65536 dirty:0
+         c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         d: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++ qcow2 bitmaps: c b
+ libvirt-3-storage:
+ libvirt-4-format:
+ libvirt-4-storage:
+ libvirt-5-format:
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++ qcow2 bitmaps: a
+ libvirt-5-storage:
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemu-monitor-Extract-block-latency-histogram-stats-into-qemuBlockStats.patch b/SOURCES/libvirt-qemu-monitor-Extract-block-latency-histogram-stats-into-qemuBlockStats.patch
new file mode 100644
index 0000000..0a68039
--- /dev/null
+++ b/SOURCES/libvirt-qemu-monitor-Extract-block-latency-histogram-stats-into-qemuBlockStats.patch
@@ -0,0 +1,168 @@
+From 4fd9bb99544f24fa4db9b2a4bac85778f354e749 Mon Sep 17 00:00:00 2001
+Message-ID: <4fd9bb99544f24fa4db9b2a4bac85778f354e749.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 29 Jan 2026 14:08:18 +0100
+Subject: [PATCH] qemu: monitor: Extract block latency histogram stats into
+ 'qemuBlockStats'
+
+Extract the 'rd_latency_histogram', 'wr_latency_histogram',
+'zone_append_latency_histogram', and 'flush_latency_histogram' stats
+objects into our internal data.
+
+Rather than storing 'boundaries' between bins we store them as start
+points.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 1c77d396ea9704eae09d7fea160cfd1a897beaf3)
+
+https://issues.redhat.com/browse/RHEL-147866 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-131335 [rhel-10.2]
+---
+ src/qemu/qemu_monitor.c      | 20 +++++++++++++
+ src/qemu/qemu_monitor.h      | 18 ++++++++++++
+ src/qemu/qemu_monitor_json.c | 55 ++++++++++++++++++++++++++++++++++++
+ 3 files changed, 93 insertions(+)
+
+diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
+index 504500c864..cdd08004fb 100644
+--- a/src/qemu/qemu_monitor.c
++++ b/src/qemu/qemu_monitor.c
+@@ -1986,6 +1986,26 @@ qemuBlockStatsFinalize(GObject *object)
+     g_free(stats->limits);
+     g_free(stats->timed_stats);
+ 
++    if (stats->histogram_read) {
++        g_free(stats->histogram_read->bins);
++        g_free(stats->histogram_read);
++    }
++
++    if (stats->histogram_write) {
++        g_free(stats->histogram_write->bins);
++        g_free(stats->histogram_write);
++    }
++
++    if (stats->histogram_zone) {
++        g_free(stats->histogram_zone->bins);
++        g_free(stats->histogram_zone);
++    }
++
++    if (stats->histogram_flush) {
++        g_free(stats->histogram_flush->bins);
++        g_free(stats->histogram_flush);
++    }
++
+     G_OBJECT_CLASS(qemu_block_stats_parent_class)->finalize(object);
+ }
+ 
+diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
+index 041aa7bc12..238f7be875 100644
+--- a/src/qemu/qemu_monitor.h
++++ b/src/qemu/qemu_monitor.h
+@@ -806,6 +806,18 @@ struct qemuBlockStatsLimits {
+ };
+ 
+ 
++struct qemuBlockStatsLatencyHistogramBin {
++    unsigned long long start;
++    unsigned long long value;
++};
++
++
++struct qemuBlockStatsLatencyHistogram {
++    struct qemuBlockStatsLatencyHistogramBin *bins;
++    size_t nbins;
++};
++
++
+ struct qemuBlockStatsTimed {
+     unsigned long long interval_length;
+ 
+@@ -858,6 +870,12 @@ struct _qemuBlockStats {
+     /* block accounting/timed stats from qemu - one entry per interval configured */
+     size_t n_timed_stats;
+     struct qemuBlockStatsTimed *timed_stats;
++
++    /* latency histograms */
++    struct qemuBlockStatsLatencyHistogram *histogram_read;
++    struct qemuBlockStatsLatencyHistogram *histogram_write;
++    struct qemuBlockStatsLatencyHistogram *histogram_zone;
++    struct qemuBlockStatsLatencyHistogram *histogram_flush;
+ };
+ G_DECLARE_FINAL_TYPE(qemuBlockStats, qemu_block_stats, QEMU, BLOCK_STATS, GObject);
+ 
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index 401a28ff9a..edeea22ee0 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -2425,6 +2425,52 @@ qemuMonitorJSONBlockStatsCollectDataTimed(virJSONValue *timed_stats,
+ }
+ 
+ 
++static void
++qemuMonitorJSONBlockStatsCollectDataLatencyHistogram(virJSONValue *stats,
++                                                     const char *histogram_field,
++                                                     struct qemuBlockStatsLatencyHistogram **histogram_data)
++{
++    virJSONValue *hist;
++    virJSONValue *hist_bins;
++    virJSONValue *hist_bounds;
++    g_autofree struct qemuBlockStatsLatencyHistogramBin *bins = NULL;
++    size_t nbins = 0;
++    size_t i;
++
++    if (!(hist = virJSONValueObjectGetObject(stats, histogram_field)))
++        return;
++
++    if (!(hist_bins = virJSONValueObjectGetArray(hist, "bins")) ||
++        !(hist_bounds = virJSONValueObjectGetArray(hist, "boundaries")) ||
++        virJSONValueArraySize(hist_bins) != (virJSONValueArraySize(hist_bounds) + 1)) {
++        VIR_DEBUG("malformed latency histogram container");
++        return;
++    }
++
++    nbins = virJSONValueArraySize(hist_bins);
++    bins = g_new0(struct qemuBlockStatsLatencyHistogramBin, nbins);
++
++    for (i = 0; i < nbins; i++) {
++        virJSONValue *bin = virJSONValueArrayGet(hist_bins, i);
++        virJSONValue *bound = NULL;
++
++        if (i > 0)
++            bound = virJSONValueArrayGet(hist_bounds, i - 1);
++
++        if (!bin ||
++            virJSONValueGetNumberUlong(bin, &(bins[i].value)) < 0 ||
++            (bound && virJSONValueGetNumberUlong(bound, &(bins[i].start)) < 0)) {
++            VIR_DEBUG("malformed latency histogram container");
++            return;
++        }
++    }
++
++    *histogram_data = g_new0(struct qemuBlockStatsLatencyHistogram, 1);
++    (*histogram_data)->bins = g_steal_pointer(&bins);
++    (*histogram_data)->nbins = nbins;
++}
++
++
+ static qemuBlockStats *
+ qemuMonitorJSONBlockStatsCollectData(virJSONValue *dev,
+                                      int *nstats)
+@@ -2469,6 +2515,15 @@ qemuMonitorJSONBlockStatsCollectData(virJSONValue *dev,
+             bstats->wr_highest_offset_valid = true;
+     }
+ 
++    qemuMonitorJSONBlockStatsCollectDataLatencyHistogram(stats, "rd_latency_histogram",
++                                                         &bstats->histogram_read);
++    qemuMonitorJSONBlockStatsCollectDataLatencyHistogram(stats, "wr_latency_histogram",
++                                                         &bstats->histogram_write);
++    qemuMonitorJSONBlockStatsCollectDataLatencyHistogram(stats, "zone_append_latency_histogram",
++                                                         &bstats->histogram_zone);
++    qemuMonitorJSONBlockStatsCollectDataLatencyHistogram(stats, "flush_latency_histogram",
++                                                         &bstats->histogram_flush);
++
+     if ((timed_stats = virJSONValueObjectGetArray(stats, "timed_stats")) &&
+         virJSONValueArraySize(timed_stats) > 0)
+         qemuMonitorJSONBlockStatsCollectDataTimed(timed_stats, bstats);
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-open-VFIO-FDs-from-libvirt-backend.patch b/SOURCES/libvirt-qemu-open-VFIO-FDs-from-libvirt-backend.patch
new file mode 100644
index 0000000..7b593b1
--- /dev/null
+++ b/SOURCES/libvirt-qemu-open-VFIO-FDs-from-libvirt-backend.patch
@@ -0,0 +1,246 @@
+From d697b98bdf3cbd1adf612eeaf92acc4633872d23 Mon Sep 17 00:00:00 2001
+Message-ID: <d697b98bdf3cbd1adf612eeaf92acc4633872d23.1770383236.git.jdenemar@redhat.com>
+From: Nathan Chen <nathanc@nvidia.com>
+Date: Fri, 30 Jan 2026 10:59:15 -0800
+Subject: [PATCH] qemu: open VFIO FDs from libvirt backend
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Open VFIO FDs from libvirt backend without exposing
+these FDs to XML users, i.e. one per iommufd hostdev
+for /dev/vfio/devices/vfioX, and pass the FD to qemu
+command line.
+
+Suggested-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Nathan Chen <nathanc@nvidia.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit f6230804727df834da27370e835204672218ab23)
+
+Resolves: https://issues.redhat.com/browse/RHEL-126345
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/libvirt_private.syms |  1 +
+ src/qemu/qemu_command.c  | 21 +++++++++++
+ src/qemu/qemu_process.c  | 78 ++++++++++++++++++++++++++++++++++++++++
+ src/util/virpci.c        | 39 ++++++++++++++++++++
+ src/util/virpci.h        |  2 ++
+ 5 files changed, 141 insertions(+)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index 66261ed6cf..e2a7a16347 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -3162,6 +3162,7 @@ virPCIDeviceGetStubDriverName;
+ virPCIDeviceGetStubDriverType;
+ virPCIDeviceGetUnbindFromStub;
+ virPCIDeviceGetUsedBy;
++virPCIDeviceGetVfioPath;
+ virPCIDeviceGetVPD;
+ virPCIDeviceHasPCIExpressLink;
+ virPCIDeviceIsAssignable;
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 96cd6edbfc..a98b26aa8a 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -4803,6 +4803,18 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
+                               NULL) < 0)
+         return NULL;
+ 
++    if (pcisrc->driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO &&
++        pcisrc->driver.iommufd == VIR_TRISTATE_BOOL_YES) {
++        qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(dev);
++
++        if (hostdevPriv->vfioDeviceFd != -1) {
++            g_autofree char *fdstr = g_strdup_printf("%d", hostdevPriv->vfioDeviceFd);
++            if (virJSONValueObjectAdd(&props, "S:fd", fdstr, NULL) < 0)
++                return NULL;
++            hostdevPriv->vfioDeviceFd = -1;
++        }
++    }
++
+     if (qemuBuildDeviceAddressProps(props, def, dev->info) < 0)
+         return NULL;
+ 
+@@ -5247,6 +5259,15 @@ qemuBuildHostdevCommandLine(virCommand *cmd,
+             if (qemuCommandAddExtDevice(cmd, hostdev->info, def, qemuCaps) < 0)
+                 return -1;
+ 
++            if (subsys->u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES) {
++                qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
++
++                if (hostdevPriv->vfioDeviceFd != -1) {
++                    virCommandPassFD(cmd, hostdevPriv->vfioDeviceFd,
++                                     VIR_COMMAND_PASS_FD_CLOSE_PARENT);
++                }
++            }
++
+             if (!(devprops = qemuBuildPCIHostdevDevProps(def, hostdev)))
+                 return -1;
+ 
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 0e50cd1ccc..1ac57a6321 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -103,6 +103,7 @@
+ #include "storage_source.h"
+ #include "backup_conf.h"
+ #include "storage_file_probe.h"
++#include "virpci.h"
+ 
+ #include "logging/log_manager.h"
+ #include "logging/log_protocol.h"
+@@ -7671,6 +7672,81 @@ qemuProcessPrepareHostBackendChardevHotplug(virDomainObj *vm,
+     return 0;
+ }
+ 
++/**
++ * qemuProcessOpenVfioDeviceFd:
++ * @hostdev: host device definition
++ * @vfioFd: returned file descriptor
++ *
++ * Opens the VFIO device file descriptor for a hostdev.
++ *
++ * Returns: FD on success, -1 on failure
++ */
++static int
++qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev)
++{
++    g_autofree char *vfioPath = NULL;
++    int fd = -1;
++
++    if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
++        hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
++                       _("VFIO FD only supported for PCI hostdevs"));
++        return -1;
++    }
++
++    if (virPCIDeviceGetVfioPath(&hostdev->source.subsys.u.pci.addr, &vfioPath) < 0)
++        return -1;
++
++    VIR_DEBUG("Opening VFIO device %s", vfioPath);
++
++    if ((fd = open(vfioPath, O_RDWR | O_CLOEXEC)) < 0) {
++        if (errno == ENOENT) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                           _("VFIO device %1$s not found - ensure device is bound to vfio-pci driver"),
++                           vfioPath);
++        } else {
++            virReportSystemError(errno,
++                                 _("cannot open VFIO device %1$s"), vfioPath);
++        }
++        return -1;
++    }
++
++    VIR_DEBUG("Opened VFIO device FD %d for %s", fd, vfioPath);
++    return fd;
++}
++
++/**
++ * qemuProcessOpenVfioFds:
++ * @vm: domain object
++ *
++ * Opens all necessary VFIO file descriptors for the domain.
++ *
++ * Returns: 0 on success, -1 on failure
++ */
++static int
++qemuProcessOpenVfioFds(virDomainObj *vm)
++{
++    size_t i;
++
++    /* Check if we have any hostdevs that need VFIO FDs */
++    for (i = 0; i < vm->def->nhostdevs; i++) {
++        virDomainHostdevDef *hostdev = vm->def->hostdevs[i];
++        qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
++
++        if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
++            hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
++            hostdev->source.subsys.u.pci.driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO &&
++            hostdev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES) {
++            /* Open VFIO device FD */
++            hostdevPriv->vfioDeviceFd = qemuProcessOpenVfioDeviceFd(hostdev);
++            if (hostdevPriv->vfioDeviceFd == -1)
++                 return -1;
++        }
++    }
++
++    return 0;
++}
++
+ /**
+  * qemuProcessPrepareHost:
+  * @driver: qemu driver
+@@ -7726,6 +7802,8 @@ qemuProcessPrepareHost(virQEMUDriver *driver,
+         hostdev_flags |= VIR_HOSTDEV_COLD_BOOT;
+     if (qemuHostdevPrepareDomainDevices(driver, vm->def, hostdev_flags) < 0)
+         return -1;
++    if (qemuProcessOpenVfioFds(vm) < 0)
++        return -1;
+ 
+     VIR_DEBUG("Preparing chr device backends");
+     if (qemuProcessPrepareHostBackendChardev(vm) < 0)
+diff --git a/src/util/virpci.c b/src/util/virpci.c
+index 90617e69c6..2348a98003 100644
+--- a/src/util/virpci.c
++++ b/src/util/virpci.c
+@@ -3320,3 +3320,42 @@ virPCIDeviceAddressFree(virPCIDeviceAddress *address)
+ {
+     g_free(address);
+ }
++
++/**
++ * virPCIDeviceGetVfioPath:
++ * @addr: host device PCI address
++ * @vfioPath: returned VFIO device path
++ *
++ * Constructs the VFIO device path for a PCI hostdev.
++ *
++ * Returns: 0 on success, -1 on failure
++ */
++int
++virPCIDeviceGetVfioPath(virPCIDeviceAddress *addr,
++                        char **vfioPath)
++{
++    g_autofree char *addrStr = NULL;
++    g_autofree char *sysfsPath = NULL;
++    g_autoptr(DIR) dir = NULL;
++    struct dirent *entry = NULL;
++
++    *vfioPath = NULL;
++    addrStr = virPCIDeviceAddressAsString(addr);
++
++    /* Look in device's vfio-dev subdirectory */
++    sysfsPath = g_strdup_printf("/sys/bus/pci/devices/%s/vfio-dev/", addrStr);
++
++    if (virDirOpen(&dir, sysfsPath) == 1) {
++        while (virDirRead(dir, &entry, sysfsPath) > 0) {
++            if (STRPREFIX(entry->d_name, "vfio")) {
++                *vfioPath = g_strdup_printf("/dev/vfio/devices/%s", entry->d_name);
++                return 0;
++            }
++        }
++    }
++
++    virReportError(VIR_ERR_INTERNAL_ERROR,
++                   _("cannot find VFIO device for PCI device %1$s"),
++                   addrStr);
++    return -1;
++}
+diff --git a/src/util/virpci.h b/src/util/virpci.h
+index fc538566e1..24ede10755 100644
+--- a/src/util/virpci.h
++++ b/src/util/virpci.h
+@@ -296,6 +296,8 @@ void virPCIEDeviceInfoFree(virPCIEDeviceInfo *dev);
+ 
+ void virPCIDeviceAddressFree(virPCIDeviceAddress *address);
+ 
++int virPCIDeviceGetVfioPath(virPCIDeviceAddress *addr, char **vfioPath);
++
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIDevice, virPCIDeviceFree);
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIDeviceAddress, virPCIDeviceAddressFree);
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIEDeviceInfo, virPCIEDeviceInfoFree);
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemu-open-iommufd-FD-from-libvirt-backend.patch b/SOURCES/libvirt-qemu-open-iommufd-FD-from-libvirt-backend.patch
new file mode 100644
index 0000000..ea03c4a
--- /dev/null
+++ b/SOURCES/libvirt-qemu-open-iommufd-FD-from-libvirt-backend.patch
@@ -0,0 +1,174 @@
+From 0800b120a87585c1f1c3e95586738200a71b5370 Mon Sep 17 00:00:00 2001
+Message-ID: <0800b120a87585c1f1c3e95586738200a71b5370.1770383236.git.jdenemar@redhat.com>
+From: Nathan Chen <nathanc@nvidia.com>
+Date: Fri, 30 Jan 2026 10:59:16 -0800
+Subject: [PATCH] qemu: open iommufd FD from libvirt backend
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Open iommufd FD from libvirt backend without exposing
+these FDs to XML users, i.e. one per domain for
+/dev/iommu, and pass the FD to qemu command line. Set
+per-process memory accounting for iommufd instead of
+the default per-user memory accounting.
+
+Suggested-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Nathan Chen <nathanc@nvidia.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 2f0999a161910e3992458902ce90d37f8b8f2642)
+
+Resolves: https://issues.redhat.com/browse/RHEL-126345
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_command.c | 13 +++++++++++--
+ src/qemu/qemu_domain.c  |  1 +
+ src/qemu/qemu_domain.h  |  2 ++
+ src/qemu/qemu_process.c | 43 +++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 57 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index a98b26aa8a..807529f670 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -5342,9 +5342,13 @@ qemuBuildHostdevCommandLine(virCommand *cmd,
+ 
+ static int
+ qemuBuildIOMMUFDCommandLine(virCommand *cmd,
+-                            const virDomainDef *def)
++                            const virDomainDef *def,
++                            virDomainObj *vm)
+ {
+     size_t i;
++    qemuDomainObjPrivate *priv = vm->privateData;
++    g_autofree char *fdstr = g_strdup_printf("%d", priv->iommufd);
++
+ 
+     for (i = 0; i < def->nhostdevs; i++) {
+         virDomainHostdevDef *hostdev = def->hostdevs[i];
+@@ -5363,8 +5367,13 @@ qemuBuildIOMMUFDCommandLine(virCommand *cmd,
+         if (subsys->u.pci.driver.iommufd != VIR_TRISTATE_BOOL_YES)
+             continue;
+ 
++        virCommandPassFD(cmd, priv->iommufd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
++
++        priv->iommufd = -1;
++
+         if (qemuMonitorCreateObjectProps(&props, "iommufd",
+                                          "iommufd0",
++                                         "S:fd", fdstr,
+                                          NULL) < 0)
+             return -1;
+ 
+@@ -10990,7 +10999,7 @@ qemuBuildCommandLine(virDomainObj *vm,
+     if (qemuBuildRedirdevCommandLine(cmd, def, qemuCaps) < 0)
+         return NULL;
+ 
+-    if (qemuBuildIOMMUFDCommandLine(cmd, def) < 0)
++    if (qemuBuildIOMMUFDCommandLine(cmd, def, vm) < 0)
+         return NULL;
+ 
+     if (qemuBuildHostdevCommandLine(cmd, def, qemuCaps) < 0)
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 3366214677..8e1ebe7799 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -2042,6 +2042,7 @@ qemuDomainObjPrivateAlloc(void *opaque)
+     priv->blockjobs = virHashNew(virObjectUnref);
+     priv->fds = virHashNew(g_object_unref);
+ 
++    priv->iommufd = -1;
+     priv->pidMonitored = -1;
+ 
+     /* agent commands block by default, user can choose different behavior */
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index 88c8416aa4..3361e97315 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -264,6 +264,8 @@ struct _qemuDomainObjPrivate {
+     /* named file descriptor groups associated with the VM */
+     GHashTable *fds;
+ 
++    int iommufd;
++
+     char *memoryBackingDir;
+ };
+ 
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 1ac57a6321..d8f0c78fd1 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -104,6 +104,7 @@
+ #include "backup_conf.h"
+ #include "storage_file_probe.h"
+ #include "virpci.h"
++#include "viriommufd.h"
+ 
+ #include "logging/log_manager.h"
+ #include "logging/log_protocol.h"
+@@ -7672,6 +7673,42 @@ qemuProcessPrepareHostBackendChardevHotplug(virDomainObj *vm,
+     return 0;
+ }
+ 
++/**
++ * qemuProcessOpenIommuFd:
++ * @vm: domain object
++ * @iommuFd: returned file descriptor
++ *
++ * Opens /dev/iommu file descriptor for the VM.
++ *
++ * Returns: FD on success, -1 on failure
++ */
++static int
++qemuProcessOpenIommuFd(virDomainObj *vm)
++{
++    int fd = -1;
++
++    VIR_DEBUG("Opening IOMMU FD for domain %s", vm->def->name);
++
++    if ((fd = open(VIR_IOMMU_DEV_PATH, O_RDWR | O_CLOEXEC)) < 0) {
++        if (errno == ENOENT) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("IOMMU FD support requires /dev/iommu device"));
++        } else {
++            virReportSystemError(errno, "%s",
++                                 _("cannot open /dev/iommu"));
++        }
++        return -1;
++    }
++
++    if (virIOMMUFDSetRLimitMode(fd, true) < 0) {
++        VIR_FORCE_CLOSE(fd);
++        return -1;
++    }
++
++    VIR_DEBUG("Opened IOMMU FD %d for domain %s", fd, vm->def->name);
++    return fd;
++}
++
+ /**
+  * qemuProcessOpenVfioDeviceFd:
+  * @hostdev: host device definition
+@@ -7726,6 +7763,7 @@ qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev)
+ static int
+ qemuProcessOpenVfioFds(virDomainObj *vm)
+ {
++    qemuDomainObjPrivate *priv = vm->privateData;
+     size_t i;
+ 
+     /* Check if we have any hostdevs that need VFIO FDs */
+@@ -7741,6 +7779,11 @@ qemuProcessOpenVfioFds(virDomainObj *vm)
+             hostdevPriv->vfioDeviceFd = qemuProcessOpenVfioDeviceFd(hostdev);
+             if (hostdevPriv->vfioDeviceFd == -1)
+                  return -1;
++
++            /* Open IOMMU FD */
++            priv->iommufd = qemuProcessOpenIommuFd(vm);
++            if (priv->iommufd == -1)
++                return -1;
+         }
+     }
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemu-parse-deprecated-props-from-query-cpu-model-expansion-response.patch b/SOURCES/libvirt-qemu-parse-deprecated-props-from-query-cpu-model-expansion-response.patch
deleted file mode 100644
index 17e5334..0000000
--- a/SOURCES/libvirt-qemu-parse-deprecated-props-from-query-cpu-model-expansion-response.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-From db00ca8dbb2feacf9307ce6e07058ff39ca7e3d6 Mon Sep 17 00:00:00 2001
-Message-ID: <db00ca8dbb2feacf9307ce6e07058ff39ca7e3d6.1749039441.git.jdenemar@redhat.com>
-From: Collin Walling <walling@linux.ibm.com>
-Date: Mon, 16 Dec 2024 18:03:53 -0500
-Subject: [PATCH] qemu: parse deprecated-props from query-cpu-model-expansion
- response
-
-query-cpu-model-expansion may report an array of deprecated properties.
-This array is optional, and may not be supported for a particular
-architecture or reported for a particular CPU model. If the output is
-present, then capture it and store in a qemuMonitorCPUModelInfo struct
-for later use.
-
-The deprecated features will be retained in qemuCaps->kvm->hostCPU.info
-and will be stored in the capabilities cache file under the <hostCPU>
-element using the following format:
-
-        <deprecatedFeatures>
-                <property name='bpb'/>
-                <property name='csske'/>
-                <property name='cte'/>
-                <property name='te'/>
-        </deprecatedFeatures>
-
-At this time the data is only queried, parsed, and cached.  The data
-will be utilized in a subsequent patch.
-
-Signed-off-by: Collin Walling <walling@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 45140d293007c1b29f7563bf6ee9640e27769b96)
-JIRA: https://issues.redhat.com/browse/RHEL-89415
-Signed-off-by: Thomas Huth <thuth@redhat.com>
----
- src/qemu/qemu_capabilities.c                  | 31 +++++++++++++++++++
- src/qemu/qemu_monitor.c                       |  3 ++
- src/qemu/qemu_monitor.h                       |  1 +
- src/qemu/qemu_monitor_json.c                  | 18 +++++++++++
- .../qemucapabilitiesdata/caps_9.1.0_s390x.xml |  6 ++++
- .../qemucapabilitiesdata/caps_9.2.0_s390x.xml |  6 ++++
- 6 files changed, 65 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index b507027667..b1faea3ac7 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -4029,6 +4029,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccel *caps,
-                                 const char *typeStr)
- {
-     xmlNodePtr hostCPUNode;
-+    xmlNodePtr deprecated_props;
-     g_autofree xmlNodePtr *nodes = NULL;
-     VIR_XPATH_NODE_AUTORESTORE(ctxt)
-     g_autoptr(qemuMonitorCPUModelInfo) hostCPU = NULL;
-@@ -4121,6 +4122,24 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccel *caps,
-         }
-     }
- 
-+    ctxt->node = hostCPUNode;
-+
-+    if ((deprecated_props = virXPathNode("./deprecatedFeatures", ctxt))) {
-+        g_autoptr(GPtrArray) props = virXMLNodeGetSubelementList(deprecated_props, NULL);
-+
-+        hostCPU->deprecated_props = g_new0(char *, props->len + 1);
-+
-+        for (i = 0; i < props->len; i++) {
-+            xmlNodePtr prop = g_ptr_array_index(props, i);
-+
-+            if (!(hostCPU->deprecated_props[i] = virXMLPropString(prop, "name"))) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                               _("missing 'name' attribute for a host CPU model deprecated property in QEMU capabilities cache"));
-+                return -1;
-+            }
-+        }
-+    }
-+
-     caps->hostCPU.info = g_steal_pointer(&hostCPU);
-     return 0;
- }
-@@ -4853,6 +4872,18 @@ virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsAccel *caps,
-         virBufferAddLit(buf, "/>\n");
-     }
- 
-+    if (model->deprecated_props) {
-+        virBufferAddLit(buf, "<deprecatedFeatures>\n");
-+        virBufferAdjustIndent(buf, 2);
-+
-+        for (i = 0; i < g_strv_length(model->deprecated_props); i++)
-+            virBufferAsprintf(buf, "<property name='%s'/>\n",
-+                              model->deprecated_props[i]);
-+
-+        virBufferAdjustIndent(buf, -2);
-+        virBufferAddLit(buf, "</deprecatedFeatures>\n");
-+    }
-+
-     virBufferAdjustIndent(buf, -2);
-     virBufferAddLit(buf, "</hostCPU>\n");
- }
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index ed63b7a29b..3945aa92e5 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -3319,6 +3319,7 @@ qemuMonitorCPUModelInfoFree(qemuMonitorCPUModelInfo *model_info)
-             g_free(model_info->props[i].value.string);
-     }
- 
-+    g_strfreev(model_info->deprecated_props);
-     g_free(model_info->props);
-     g_free(model_info->name);
-     g_free(model_info);
-@@ -3363,6 +3364,8 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModelInfo *orig)
-         }
-     }
- 
-+    copy->deprecated_props = g_strdupv(orig->deprecated_props);
-+
-     return copy;
- }
- 
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index bcb39409ac..acb3279e45 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -1160,6 +1160,7 @@ struct _qemuMonitorCPUModelInfo {
-     char *name;
-     size_t nprops;
-     qemuMonitorCPUProperty *props;
-+    GStrv deprecated_props;
-     bool migratability;
- };
- 
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 5df32922fb..edf6fac76e 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -5130,6 +5130,7 @@ qemuMonitorJSONParseCPUModelExpansionData(virJSONValue *data,
-                                           bool fail_no_props,
-                                           virJSONValue **cpu_model,
-                                           virJSONValue **cpu_props,
-+                                          virJSONValue **cpu_deprecated_props,
-                                           const char **cpu_name)
- {
-     if (qemuMonitorJSONParseCPUModelData(data, "query-cpu-model-expansion",
-@@ -5137,6 +5138,12 @@ qemuMonitorJSONParseCPUModelExpansionData(virJSONValue *data,
-                                          cpu_name) < 0)
-         return -1;
- 
-+    /*
-+     * Unconditionally check for the deprecated-props array, as
-+     * it is not a guarantee response even if QEMU supports it.
-+     */
-+    *cpu_deprecated_props = virJSONValueObjectGetArray(data, "deprecated-props");
-+
-     return 0;
- }
- 
-@@ -5144,6 +5151,7 @@ qemuMonitorJSONParseCPUModelExpansionData(virJSONValue *data,
- static int
- qemuMonitorJSONParseCPUModelExpansion(const char *cpu_name,
-                                       virJSONValue *cpu_props,
-+                                      virJSONValue *cpu_deprecated_props,
-                                       qemuMonitorCPUModelInfo **model_info)
- {
-     g_autoptr(qemuMonitorCPUModelInfo) expanded_model = NULL;
-@@ -5151,6 +5159,12 @@ qemuMonitorJSONParseCPUModelExpansion(const char *cpu_name,
-     if (qemuMonitorJSONParseCPUModel(cpu_name, cpu_props, &expanded_model) < 0)
-         return -1;
- 
-+    if (cpu_deprecated_props &&
-+        virJSONValueArraySize(cpu_deprecated_props) &&
-+        (!(expanded_model->deprecated_props = virJSONValueArrayToStringList(cpu_deprecated_props)))) {
-+        return -1;
-+    }
-+
-     *model_info = g_steal_pointer(&expanded_model);
-     return 0;
- }
-@@ -5215,6 +5229,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon,
-     g_autoptr(virJSONValue) fullData = NULL;
-     virJSONValue *cpu_model;
-     virJSONValue *cpu_props = NULL;
-+    virJSONValue *cpu_deprecated_props = NULL;
-     const char *cpu_name = "";
-     int rc;
- 
-@@ -5228,6 +5243,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon,
- 
-     if (qemuMonitorJSONParseCPUModelExpansionData(data, fail_no_props,
-                                                   &cpu_model, &cpu_props,
-+                                                  &cpu_deprecated_props,
-                                                   &cpu_name) < 0)
-         return -1;
- 
-@@ -5246,11 +5262,13 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon,
- 
-         if (qemuMonitorJSONParseCPUModelExpansionData(fullData, fail_no_props,
-                                                       &cpu_model, &cpu_props,
-+                                                      &cpu_deprecated_props,
-                                                       &cpu_name) < 0)
-             return -1;
-     }
- 
-     return qemuMonitorJSONParseCPUModelExpansion(cpu_name, cpu_props,
-+                                                 cpu_deprecated_props,
-                                                  model_info);
- }
- 
-diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
-index 50e9a60a1f..5e8db88e52 100644
---- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
-@@ -193,6 +193,12 @@
-     <property name='te' type='boolean' value='true'/>
-     <property name='cmm' type='boolean' value='true'/>
-     <property name='vxpdeh2' type='boolean' value='true'/>
-+    <deprecatedFeatures>
-+      <property name='bpb'/>
-+      <property name='te'/>
-+      <property name='cte'/>
-+      <property name='csske'/>
-+    </deprecatedFeatures>
-   </hostCPU>
-   <cpu type='kvm' name='z13' typename='z13-s390x-cpu' usable='yes'/>
-   <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/>
-diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
-index 6d4f6726fb..79a149d187 100644
---- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
-@@ -196,6 +196,12 @@
-     <property name='te' type='boolean' value='true'/>
-     <property name='cmm' type='boolean' value='true'/>
-     <property name='vxpdeh2' type='boolean' value='true'/>
-+    <deprecatedFeatures>
-+      <property name='bpb'/>
-+      <property name='te'/>
-+      <property name='cte'/>
-+      <property name='csske'/>
-+    </deprecatedFeatures>
-   </hostCPU>
-   <cpu type='kvm' name='z13' typename='z13-s390x-cpu' usable='yes'/>
-   <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-process-Export-qemuPrepareNVRAM-for-use-in-snapshot-code.patch b/SOURCES/libvirt-qemu-process-Export-qemuPrepareNVRAM-for-use-in-snapshot-code.patch
deleted file mode 100644
index 9127957..0000000
--- a/SOURCES/libvirt-qemu-process-Export-qemuPrepareNVRAM-for-use-in-snapshot-code.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 556d3cac6b834a7f5630e31bac2f4f594392bde6 Mon Sep 17 00:00:00 2001
-Message-ID: <556d3cac6b834a7f5630e31bac2f4f594392bde6.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 3 Feb 2025 17:48:05 +0100
-Subject: [PATCH] qemu: process: Export qemuPrepareNVRAM for use in snapshot
- code
-
-Export qemuPrepareNVRAM so that it doesn't require the VM object. The
-snapshot code needs in the corner case of creating a snapshot of a
-freshly defined VM ensure that the nvram image exists in order to
-snapshot it.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit a377404ed912e8d17e88ef3eb8e71143eff88f7d)
-
-https://issues.redhat.com/browse/RHEL-73315
----
- src/qemu/qemu_process.c | 26 ++++++++++++++------------
- src/qemu/qemu_process.h |  4 ++++
- 2 files changed, 18 insertions(+), 12 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index b9d69649ca..1866c8f4e1 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -4627,10 +4627,9 @@ qemuPrepareNVRAMHelper(int dstFD,
- 
- 
- static int
--qemuPrepareNVRAMBlock(virDomainObj *vm,
-+qemuPrepareNVRAMBlock(virDomainLoaderDef *loader,
-                       bool reset_nvram)
- {
--    virDomainLoaderDef *loader = vm->def->os.loader;
-     g_autoptr(virCommand) qemuimg = NULL;
-     const char *templateFormatStr = "raw";
- 
-@@ -4691,13 +4690,12 @@ qemuPrepareNVRAMBlock(virDomainObj *vm,
- 
- 
- static int
--qemuPrepareNVRAMFile(virDomainObj *vm,
-+qemuPrepareNVRAMFile(virQEMUDriver *driver,
-+                     virDomainLoaderDef *loader,
-                      bool reset_nvram)
- {
--    qemuDomainObjPrivate *priv = vm->privateData;
--    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver);
-+    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-     VIR_AUTOCLOSE srcFD = -1;
--    virDomainLoaderDef *loader = vm->def->os.loader;
-     struct qemuPrepareNVRAMHelperData data;
- 
-     if (virFileExists(loader->nvram->path) && !reset_nvram)
-@@ -4739,21 +4737,24 @@ qemuPrepareNVRAMFile(virDomainObj *vm,
- }
- 
- 
--static int
--qemuPrepareNVRAM(virDomainObj *vm,
-+int
-+qemuPrepareNVRAM(virQEMUDriver *driver,
-+                 virDomainDef *def,
-                  bool reset_nvram)
- {
--    virDomainLoaderDef *loader = vm->def->os.loader;
-+    virDomainLoaderDef *loader = def->os.loader;
- 
-     if (!loader || !loader->nvram)
-         return 0;
- 
-+    VIR_DEBUG("nvram='%s'", NULLSTR(loader->nvram->path));
-+
-     switch (virStorageSourceGetActualType(loader->nvram)) {
-     case VIR_STORAGE_TYPE_FILE:
--        return qemuPrepareNVRAMFile(vm, reset_nvram);
-+        return qemuPrepareNVRAMFile(driver, loader, reset_nvram);
- 
-     case VIR_STORAGE_TYPE_BLOCK:
--        return qemuPrepareNVRAMBlock(vm, reset_nvram);
-+        return qemuPrepareNVRAMBlock(loader, reset_nvram);
- 
-     case VIR_STORAGE_TYPE_DIR:
-     case VIR_STORAGE_TYPE_NETWORK:
-@@ -7408,7 +7409,8 @@ qemuProcessPrepareHost(virQEMUDriver *driver,
-         qemuProcessMakeDir(driver, vm, priv->channelTargetDir) < 0)
-         return -1;
- 
--    if (qemuPrepareNVRAM(vm, !!(flags & VIR_QEMU_PROCESS_START_RESET_NVRAM)) < 0)
-+    if (qemuPrepareNVRAM(driver, vm->def,
-+                         !!(flags & VIR_QEMU_PROCESS_START_RESET_NVRAM)) < 0)
-         return -1;
- 
-     if (vm->def->vsock) {
-diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
-index 12781673c5..fee00ce53b 100644
---- a/src/qemu/qemu_process.h
-+++ b/src/qemu/qemu_process.h
-@@ -258,3 +258,7 @@ int qemuProcessSetupEmulator(virDomainObj *vm);
- 
- void qemuProcessHandleNbdkitExit(qemuNbdkitProcess *nbdkit,
-                                  virDomainObj *vm);
-+
-+int qemuPrepareNVRAM(virQEMUDriver *driver,
-+                     virDomainDef *def,
-+                     bool reset_nvram);
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-process-Remove-un-updated-qemuProcessStartWarnShmem.patch b/SOURCES/libvirt-qemu-process-Remove-un-updated-qemuProcessStartWarnShmem.patch
deleted file mode 100644
index c780ea6..0000000
--- a/SOURCES/libvirt-qemu-process-Remove-un-updated-qemuProcessStartWarnShmem.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From f61b747b0420d71efe33f836a1117d4741ecd716 Mon Sep 17 00:00:00 2001
-Message-ID: <f61b747b0420d71efe33f836a1117d4741ecd716.1742990721.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 11 Mar 2025 09:04:18 +0100
-Subject: [PATCH] qemu: process: Remove un-updated 'qemuProcessStartWarnShmem'
-
-The checks in qemuProcessStartWarnShmem are no longer current. Since
-previous patch made it fatal for vhost-user interfaces to be configured
-without shared memory this warning code can be deleted.
-
-Resolves: https://issues.redhat.com/browse/RHEL-80533
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 080c7fd341619a3d1986a00265addaf45b63aacf)
-
-https://issues.redhat.com/browse/RHEL-84133
----
- src/qemu/qemu_process.c | 54 -----------------------------------------
- 1 file changed, 54 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 722e982b9e..fac5678439 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5406,56 +5406,6 @@ qemuProcessMakeDir(virQEMUDriver *driver,
- }
- 
- 
--static void
--qemuProcessStartWarnShmem(virDomainObj *vm)
--{
--    size_t i;
--    bool check_shmem = false;
--    bool shmem = vm->def->nshmems;
--
--    /*
--     * For vhost-user to work, the domain has to have some type of
--     * shared memory configured.  We're not the proper ones to judge
--     * whether shared hugepages or shm are enough and will be in the
--     * future, so we'll just warn in case neither is configured.
--     * Moreover failing would give the false illusion that libvirt is
--     * really checking that everything works before running the domain
--     * and not only we are unable to do that, but it's also not our
--     * aim to do so.
--     */
--    for (i = 0; i < vm->def->nnets; i++) {
--        if (virDomainNetGetActualType(vm->def->nets[i]) ==
--                                      VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
--            check_shmem = true;
--            break;
--        }
--    }
--
--    if (!check_shmem)
--        return;
--
--    /*
--     * This check is by no means complete.  We merely check
--     * whether there are *some* hugepages enabled and *some* NUMA
--     * nodes with shared memory access.
--     */
--    if (!shmem && vm->def->mem.nhugepages) {
--        for (i = 0; i < virDomainNumaGetNodeCount(vm->def->numa); i++) {
--            if (virDomainNumaGetNodeMemoryAccessMode(vm->def->numa, i) ==
--                VIR_DOMAIN_MEMORY_ACCESS_SHARED) {
--                shmem = true;
--                break;
--            }
--        }
--    }
--
--    if (!shmem) {
--        VIR_WARN("Detected vhost-user interface without any shared memory, "
--                 "the interface might not be operational");
--    }
--}
--
--
- static int
- qemuProcessStartValidateGraphics(virDomainObj *vm)
- {
-@@ -5690,10 +5640,6 @@ qemuProcessStartValidate(virQEMUDriver *driver,
-     if (qemuProcessStartValidateTSC(driver, vm) < 0)
-         return -1;
- 
--    VIR_DEBUG("Checking for any possible (non-fatal) issues");
--
--    qemuProcessStartWarnShmem(vm);
--
-     return 0;
- }
- 
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-process-Rename-qemuProcessSetupDiskThrottling-to-qemuProcessSetupDisks.patch b/SOURCES/libvirt-qemu-process-Rename-qemuProcessSetupDiskThrottling-to-qemuProcessSetupDisks.patch
new file mode 100644
index 0000000..a7fcc91
--- /dev/null
+++ b/SOURCES/libvirt-qemu-process-Rename-qemuProcessSetupDiskThrottling-to-qemuProcessSetupDisks.patch
@@ -0,0 +1,62 @@
+From 14bee26669c6847e946c694d07e55dfec3ede74e Mon Sep 17 00:00:00 2001
+Message-ID: <14bee26669c6847e946c694d07e55dfec3ede74e.1771336751.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 29 Jan 2026 11:21:38 +0100
+Subject: [PATCH] qemu: process: Rename 'qemuProcessSetupDiskThrottling' to
+ 'qemuProcessSetupDisks'
+
+Rename the runtime disk option setup function to be universal.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 42a39d703d98e4e48f0f9c8779884b6ac107de26)
+
+https://issues.redhat.com/browse/RHEL-147866 [rhel-9.8]
+https://issues.redhat.com/browse/RHEL-131335 [rhel-10.2]
+---
+ src/qemu/qemu_process.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index c99bb36c93..aadfaa92b0 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7964,21 +7964,19 @@ qemuProcessSetupDiskPropsRuntime(qemuMonitor *mon,
+ 
+ 
+ /**
+- * qemuProcessSetupDiskThrottling:
++ * qemuProcessSetupDisks:
+  *
+- * Sets up disk trottling for -blockdev via block_set_io_throttle monitor
+- * command. This hack should be replaced by proper use of the 'throttle'
+- * blockdev driver in qemu once it will support changing of the throttle group.
+- * Same hack is done in qemuDomainAttachDiskGeneric.
++ * Sets up disk settings available only at runtime:
++ *  - trottling for -blockdev via block_set_io_throttle QMP command
+  */
+ static int
+-qemuProcessSetupDiskThrottling(virDomainObj *vm,
+-                               virDomainAsyncJob asyncJob)
++qemuProcessSetupDisks(virDomainObj *vm,
++                      virDomainAsyncJob asyncJob)
+ {
+     size_t i;
+     int ret = -1;
+ 
+-    VIR_DEBUG("Setting up disk throttling for -blockdev via block_set_io_throttle");
++    VIR_DEBUG("Setting up disk config via runtime commands");
+ 
+     if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0)
+         return -1;
+@@ -8575,7 +8573,7 @@ qemuProcessLaunch(virConnectPtr conn,
+     if (qemuProcessSetupBalloon(vm, asyncJob) < 0)
+         goto cleanup;
+ 
+-    if (qemuProcessSetupDiskThrottling(vm, asyncJob) < 0)
++    if (qemuProcessSetupDisks(vm, asyncJob) < 0)
+         goto cleanup;
+ 
+     /* Since CPUs were not started yet, the balloon could not return the memory
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu-put-vhost-user-code-that-s-special-for-passt-in-a-helper-function.patch b/SOURCES/libvirt-qemu-put-vhost-user-code-that-s-special-for-passt-in-a-helper-function.patch
deleted file mode 100644
index 7427878..0000000
--- a/SOURCES/libvirt-qemu-put-vhost-user-code-that-s-special-for-passt-in-a-helper-function.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 0cc716142961427bd257a528ef54b87b3a053ade Mon Sep 17 00:00:00 2001
-Message-ID: <0cc716142961427bd257a528ef54b87b3a053ade.1747908718.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 4 Apr 2025 19:38:28 -0400
-Subject: [PATCH] qemu: put vhost-user code that's special for passt in a
- helper function
-
-Rather than duplicating these two lines of chr device object setup for
-hotplug and domain start, put them in a helper function that's called
-from both places. That way when we need to setup *more* stuff specific
-to passt+vhostuser, we can just add it in that one place.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Tested-by: Stefano Brivio <sbrivio@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 95ff77f2896478e039673bb552affec2c5a5e822)
-
-https://issues.redhat.com/browse/RHEL-80169
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/qemu/qemu_hotplug.c |  7 +------
- src/qemu/qemu_passt.c   | 19 +++++++++++++++++++
- src/qemu/qemu_passt.h   |  3 +++
- src/qemu/qemu_process.c |  9 ++-------
- 4 files changed, 25 insertions(+), 13 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index c8746f5e22..ff09b58bfe 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -1264,12 +1264,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
- 
-         if (net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
- 
--            /* vhostuser needs socket path in this location, and when
--             * backend is passt, the path is derived from other info,
--             * not taken from config.
--             */
--            g_free(net->data.vhostuser->data.nix.path);
--            net->data.vhostuser->data.nix.path = qemuPasstCreateSocketPath(vm, net);
-+            qemuPasstPrepareVhostUser(vm, net);
- 
-             if (qemuPasstStart(vm, net) < 0)
-                 goto cleanup;
-diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c
-index b9616d1c63..bc495eca1e 100644
---- a/src/qemu/qemu_passt.c
-+++ b/src/qemu/qemu_passt.c
-@@ -165,6 +165,25 @@ qemuPasstSetupCgroup(virDomainObj *vm,
- }
- 
- 
-+void
-+qemuPasstPrepareVhostUser(virDomainObj *vm,
-+                          virDomainNetDef *net)
-+{
-+    /* There are some options on the QEMU commandline for a vhost-user
-+     * chr device that are normally configurable, but when it is passt
-+     * speaking to the vhost-user device those things are
-+     * derived/fixed. This function, which is called prior to
-+     * generating the QEMU commandline, sets thos derived/fixed things
-+     * in the chr device object.
-+     */
-+
-+    /* The socket path is not user-configurable for passt - it is
-+     * derived from other info
-+     */
-+    g_free(net->data.vhostuser->data.nix.path);
-+    net->data.vhostuser->data.nix.path = qemuPasstCreateSocketPath(vm, net);
-+}
-+
- int
- qemuPasstStart(virDomainObj *vm,
-                virDomainNetDef *net)
-diff --git a/src/qemu/qemu_passt.h b/src/qemu/qemu_passt.h
-index e0b9aaac8d..ea545ccf38 100644
---- a/src/qemu/qemu_passt.h
-+++ b/src/qemu/qemu_passt.h
-@@ -37,5 +37,8 @@ int qemuPasstSetupCgroup(virDomainObj *vm,
-                          virDomainNetDef *net,
-                          virCgroup *cgroup);
- 
-+void qemuPasstPrepareVhostUser(virDomainObj *vm,
-+                               virDomainNetDef *net);
-+
- char *qemuPasstCreateSocketPath(virDomainObj *vm,
-                                 virDomainNetDef *net);
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 2076ad8208..c1ae324ad4 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5898,13 +5898,8 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm)
- 
-         case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
-             if (net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
--                /* when using the passt backend, the path of the
--                 * unix socket is always derived from other info
--                 * *not* manually given in the config, but all the
--                 * vhostuser code looks for it there.
--                 */
--                g_free(net->data.vhostuser->data.nix.path);
--                net->data.vhostuser->data.nix.path = qemuPasstCreateSocketPath(vm, net);
-+                /* some extra setup of internal data for passt vhostuser mode */
-+                qemuPasstPrepareVhostUser(vm, net);
-             }
-             break;
- 
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-re-use-existing-ActualNetDef-for-more-interface-types-during-update-device.patch b/SOURCES/libvirt-qemu-re-use-existing-ActualNetDef-for-more-interface-types-during-update-device.patch
deleted file mode 100644
index 00d08b0..0000000
--- a/SOURCES/libvirt-qemu-re-use-existing-ActualNetDef-for-more-interface-types-during-update-device.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From ace165fe4fa45ceb7e26cfd7f2fafead7cfeb503 Mon Sep 17 00:00:00 2001
-Message-ID: <ace165fe4fa45ceb7e26cfd7f2fafead7cfeb503.1737731143.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Mon, 25 Nov 2024 22:51:04 -0500
-Subject: [PATCH] qemu: re-use existing ActualNetDef for more interface types
- during update-device
-
-For the full history behind this patch, look at the following:
-
-   https://issues.redhat.com/browse/RHEL-7036
-   commit v10.7.0-101-ga37bd2a15b
-   commit v10.8.0-rc2-8-gbcd5ae4e73
-
-Summary: original problem was unexpected failure of update-device when
-the user hadn't changed anything other than online status of the guest
-NIC (which should always be allowed).
-
-The first commit "fixed" this by avoiding the allocation of a new
-ActualNetDef (i.e. creating a new networkport) for *all* network
-device updates (because that was inappropriately changing which
-ethernet physdev should be used for a macvtap connection, which by
-design can't be handled in an update-device).
-
-But this commit caused a regression for update-device of bridge-based
-network devices (because some the updates of certain attributes *do*
-require the ActualNetDef be re-allocated), so...
-
-The 2nd commit narrowed the list of network types that get the "don't
-allocate new ActualNetDef" treatment (so that only interfaces
-connected to a network that uses a pool of ethernet VFs *being used in
-passthrough mode* qualify).
-
-But then it was pointed out that this re-broke simple updates of
-devices that used a direct/macvtap network in "bridge" mode (because
-it's possible to list multiple physdevs to use for bridge mode, in
-which case the network driver attempts to "load balance" (and so a new
-allocation might have a different ethernet physdev which, again, can't
-be supported in a device-update).
-
-So this (single line of code) patch *widens* the list of network types
-that don't allocate a new ActualNetDef to also include the other
-direct (macvtap) modes, e.g. bridge, private, etc.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 4e987a86b5e4c9faf36aa5abad47fe6db6314950)
-
-https://issues.redhat.com/browse/RHEL-7036
-
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/qemu/qemu_hotplug.c | 36 ++++++++++++++++++++----------------
- 1 file changed, 20 insertions(+), 16 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 3c18af6b0c..de0777d330 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -3935,25 +3935,29 @@ qemuDomainChangeNet(virQEMUDriver *driver,
-     if (newdev->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
-         if (olddev->type == VIR_DOMAIN_NET_TYPE_NETWORK &&
-             oldType == VIR_DOMAIN_NET_TYPE_DIRECT &&
--            virDomainNetGetActualDirectMode(olddev) == VIR_NETDEV_MACVLAN_MODE_PASSTHRU &&
-             STREQ(olddev->data.network.name, newdev->data.network.name)) {
-             /* old and new are type='network', and the network name
--             * hasn't changed *and* this is a network where each
--             * connection is allocated exclusive use of a VF
--             * device. In this case we *don't* want to get a new port
--             * ("actual device") from the network because attempting
--             * to allocate a new device would also allocate a
--             * new/different VF, causing the update to fail. And
--             * anyway we can use olddev's actualNetDef (since it
--             * hasn't changed).
-+             * hasn't changed *and* this is a "direct" network (a pool
-+             * of 1 or more host ethernet devices where each guest
-+             * interface is allocated one of those physical devices
-+             * that it then connects to via macvtap). In this case we
-+             * *don't* want to get a new port ("actual device") from
-+             * the network because attempting to allocate a new port
-+             * would also allocate a new/different ethernet (physical
-+             * device), causing the update to fail (because the
-+             * physical device of a macvtap-based interface can't be
-+             * changed without completely unplugging and re-plugging
-+             * the guest NIC).
-              *
--             * So instead we just duplicate *the pointer to* the
--             * actualNetDef from olddev to newdev so that comparisons
--             * of actualNetDef will show no change. If the update is
--             * successful, we will clear the actualNetDef pointer from
--             * olddev before destroying it (or if the update fails,
--             * then we need to clear the pointer from newdev before
--             * destroying it)
-+             * We can work around this issue by just re-using olddev's
-+             * actualNetDef (since it hasn't changed) rather than
-+             * allocating a new one.  We just duplicate *the pointer
-+             * to* the actualNetDef from olddev to newdev so that
-+             * comparisons of actualNetDef will show no change. If the
-+             * update is successful, we will clear the actualNetDef
-+             * pointer from olddev before destroying it (or if the
-+             * update fails, then we need to clear the pointer from
-+             * newdev before destroying it)
-              */
-             newdev->data.network.actual = olddev->data.network.actual;
-             memcpy(newdev->data.network.portid, olddev->data.network.portid,
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-remove-nonsensical-sanity-check-in-processNetdevStreamDisconnectedEvent.patch b/SOURCES/libvirt-qemu-remove-nonsensical-sanity-check-in-processNetdevStreamDisconnectedEvent.patch
deleted file mode 100644
index 43353b4..0000000
--- a/SOURCES/libvirt-qemu-remove-nonsensical-sanity-check-in-processNetdevStreamDisconnectedEvent.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 13ff514007822c650ad0f3006882e2f85aab9b48 Mon Sep 17 00:00:00 2001
-Message-ID: <13ff514007822c650ad0f3006882e2f85aab9b48.1747908718.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 4 Apr 2025 16:48:23 -0400
-Subject: [PATCH] qemu: remove nonsensical sanity check in
- processNetdevStreamDisconnectedEvent()
-
-By definition QEMU will never send a NETDEV_STREAM_DISCONNECTED event
-if it doesn't support the reconnect option for a stream netdev. And
-even if, by some comedy of errors, it did send
-NETDEV_STREAM_DISCONNECTED in that case, our response to the event
-doesn't request anything at all of QEMU (much less something that
-would fail if QEMU didn't understand NETDEV_STREAM_DISCONNECTED) - it
-just starts a new passt process to replace the one that has been
-terminated, so we don't need to check the QEMU capabilities for
-QEMU_CAPS_NETDEV_STREAM_RECONNECT.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Tested-by: Stefano Brivio <sbrivio@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 51a54dc1c4ecf37d60acee1cb94252e51c5ef627)
-
-https://issues.redhat.com/browse/RHEL-80169
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/qemu/qemu_driver.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 11dbbc1aab..89bb10756e 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -3623,7 +3623,6 @@ processNetdevStreamDisconnectedEvent(virDomainObj *vm,
- {
-     virDomainDeviceDef dev;
-     virDomainNetDef *def;
--    virQEMUCaps *qemuCaps = QEMU_DOMAIN_PRIVATE(vm)->qemuCaps;
-     const char *devAlias = STRSKIP(netdevId, "host");
- 
-     /* The event sends us the "netdev-id", but we don't store the
-@@ -3669,12 +3668,6 @@ processNetdevStreamDisconnectedEvent(virDomainObj *vm,
-         goto endjob;
-     }
- 
--    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_STREAM_RECONNECT)) {
--        VIR_WARN("ignore NETDEV_STREAM_DISCONNECTED event for passt network device %s in domain %s - QEMU binary does not support reconnect",
--                  def->info.alias, vm->def->name);
--        goto endjob;
--    }
--
-     /* handle the event - restart the passt process with its original
-      * parameters
-      */
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-respond-to-NETDEV_VHOST_USER_DISCONNECTED-event.patch b/SOURCES/libvirt-qemu-respond-to-NETDEV_VHOST_USER_DISCONNECTED-event.patch
deleted file mode 100644
index f4dcbb7..0000000
--- a/SOURCES/libvirt-qemu-respond-to-NETDEV_VHOST_USER_DISCONNECTED-event.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From 1be043d47792afe408bef01a5c169dcd4e98e782 Mon Sep 17 00:00:00 2001
-Message-ID: <1be043d47792afe408bef01a5c169dcd4e98e782.1747908718.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 4 Apr 2025 17:16:43 -0400
-Subject: [PATCH] qemu: respond to NETDEV_VHOST_USER_DISCONNECTED event
-
-This response to this event is identical to NETDEV_STREAM_DISCONNECTED
-(start a new passt process to replace the one that just disappeared -
-see commitf62ce81b8a5), except that the new passt process will have
-"--vhost-user" appended to the commandline. Fortunately that
-difference is already handled based on the virDomainNetDef contents,
-so we can, in fact, respond to the new event in exactly the same
-manner.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Tested-by: Stefano Brivio <sbrivio@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit dedf1ada95f046310827194eb8794fa18975b9e7)
-
-Conflicts:
-
-src/qemu/qemu_driver.c:
-  In context surrounding a chunk, the arguments to
-  processNicRxFilterChangedEvent() changed upstream (due to upstream
-  commit 50981052a5f)
-
-https://issues.redhat.com/browse/RHEL-80169
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/qemu/qemu_domain.c       |  1 +
- src/qemu/qemu_domain.h       |  1 +
- src/qemu/qemu_driver.c       | 11 +++++++++++
- src/qemu/qemu_monitor.c      | 11 +++++++++++
- src/qemu/qemu_monitor.h      |  6 ++++++
- src/qemu/qemu_monitor_json.c | 16 ++++++++++++++++
- src/qemu/qemu_process.c      | 18 ++++++++++++++++++
- 7 files changed, 64 insertions(+)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 4234e4605b..cc47adb724 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -10038,6 +10038,7 @@ qemuProcessEventFree(struct qemuProcessEvent *event)
-     case QEMU_PROCESS_EVENT_WATCHDOG:
-     case QEMU_PROCESS_EVENT_DEVICE_DELETED:
-     case QEMU_PROCESS_EVENT_NETDEV_STREAM_DISCONNECTED:
-+    case QEMU_PROCESS_EVENT_NETDEV_VHOST_USER_DISCONNECTED:
-     case QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED:
-     case QEMU_PROCESS_EVENT_SERIAL_CHANGED:
-     case QEMU_PROCESS_EVENT_GUEST_CRASHLOADED:
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index 6246988491..63f422bbcb 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -465,6 +465,7 @@ typedef enum {
-     QEMU_PROCESS_EVENT_GUESTPANIC,
-     QEMU_PROCESS_EVENT_DEVICE_DELETED,
-     QEMU_PROCESS_EVENT_NETDEV_STREAM_DISCONNECTED,
-+    QEMU_PROCESS_EVENT_NETDEV_VHOST_USER_DISCONNECTED,
-     QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED,
-     QEMU_PROCESS_EVENT_SERIAL_CHANGED,
-     QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE,
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 3373dfb845..b374b1978c 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -3691,6 +3691,14 @@ processNetdevStreamDisconnectedEvent(virDomainObj *vm,
- }
- 
- 
-+static void
-+processNetdevVhostUserDisconnectedEvent(virDomainObj *vm,
-+                                        const char *netdevId)
-+{
-+    processNetdevDisconnectedEvent(vm, netdevId, "NETDEV_VHOST_USER_DISCONNECTED");
-+}
-+
-+
- static void
- processNicRxFilterChangedEvent(virDomainObj *vm,
-                                const char *devAlias)
-@@ -4089,6 +4097,9 @@ static void qemuProcessEventHandler(void *data, void *opaque)
-     case QEMU_PROCESS_EVENT_NETDEV_STREAM_DISCONNECTED:
-         processNetdevStreamDisconnectedEvent(vm, processEvent->data);
-         break;
-+    case QEMU_PROCESS_EVENT_NETDEV_VHOST_USER_DISCONNECTED:
-+        processNetdevVhostUserDisconnectedEvent(vm, processEvent->data);
-+        break;
-     case QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED:
-         processNicRxFilterChangedEvent(vm, processEvent->data);
-         break;
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 82aa1cbc5f..ed63b7a29b 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -1267,6 +1267,17 @@ qemuMonitorEmitNetdevStreamDisconnected(qemuMonitor *mon,
- }
- 
- 
-+void
-+qemuMonitorEmitNetdevVhostUserDisconnected(qemuMonitor *mon,
-+                                           const char *devAlias)
-+{
-+    VIR_DEBUG("mon=%p", mon);
-+
-+    QEMU_MONITOR_CALLBACK(mon, domainNetdevVhostUserDisconnected,
-+                          mon->vm, devAlias);
-+}
-+
-+
- void
- qemuMonitorEmitSerialChange(qemuMonitor *mon,
-                             const char *devAlias,
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 672cd6487e..bcb39409ac 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -255,6 +255,9 @@ typedef void (*qemuMonitorDomainDeviceUnplugErrCallback)(qemuMonitor *mon,
- typedef void (*qemuMonitorDomainNetdevStreamDisconnectedCallback)(qemuMonitor *mon,
-                                                                   virDomainObj *vm,
-                                                                   const char *devAlias);
-+typedef void (*qemuMonitorDomainNetdevVhostUserDisconnectedCallback)(qemuMonitor *mon,
-+                                                                     virDomainObj *vm,
-+                                                                     const char *devAlias);
- typedef void (*qemuMonitorDomainNicRxFilterChangedCallback)(qemuMonitor *mon,
-                                                             virDomainObj *vm,
-                                                             const char *devAlias);
-@@ -403,6 +406,7 @@ struct _qemuMonitorCallbacks {
-     qemuMonitorDomainMemoryDeviceSizeChange domainMemoryDeviceSizeChange;
-     qemuMonitorDomainDeviceUnplugErrCallback domainDeviceUnplugError;
-     qemuMonitorDomainNetdevStreamDisconnectedCallback domainNetdevStreamDisconnected;
-+    qemuMonitorDomainNetdevVhostUserDisconnectedCallback domainNetdevVhostUserDisconnected;
- };
- 
- qemuMonitor *qemuMonitorOpen(virDomainObj *vm,
-@@ -490,6 +494,8 @@ void qemuMonitorEmitDeviceUnplugErr(qemuMonitor *mon,
-                                     const char *devAlias);
- void qemuMonitorEmitNetdevStreamDisconnected(qemuMonitor *mon,
-                                              const char *devAlias);
-+void qemuMonitorEmitNetdevVhostUserDisconnected(qemuMonitor *mon,
-+                                                const char *devAlias);
- void qemuMonitorEmitNicRxFilterChanged(qemuMonitor *mon,
-                                        const char *devAlias);
- void qemuMonitorEmitSerialChange(qemuMonitor *mon,
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 6f9f495888..be5d3be7e6 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -85,6 +85,7 @@ static void qemuMonitorJSONHandleMemoryFailure(qemuMonitor *mon, virJSONValue *d
- static void qemuMonitorJSONHandleMemoryDeviceSizeChange(qemuMonitor *mon, virJSONValue *data);
- static void qemuMonitorJSONHandleDeviceUnplugErr(qemuMonitor *mon, virJSONValue *data);
- static void qemuMonitorJSONHandleNetdevStreamDisconnected(qemuMonitor *mon, virJSONValue *data);
-+static void qemuMonitorJSONHandleNetdevVhostUserDisconnected(qemuMonitor *mon, virJSONValue *data);
- 
- typedef struct {
-     const char *type;
-@@ -108,6 +109,7 @@ static qemuEventHandler eventHandlers[] = {
-     { "MIGRATION", qemuMonitorJSONHandleMigrationStatus, },
-     { "MIGRATION_PASS", qemuMonitorJSONHandleMigrationPass, },
-     { "NETDEV_STREAM_DISCONNECTED", qemuMonitorJSONHandleNetdevStreamDisconnected, },
-+    { "NETDEV_VHOST_USER_DISCONNECTED", qemuMonitorJSONHandleNetdevVhostUserDisconnected, },
-     { "NIC_RX_FILTER_CHANGED", qemuMonitorJSONHandleNicRxFilterChanged, },
-     { "PR_MANAGER_STATUS_CHANGED", qemuMonitorJSONHandlePRManagerStatusChanged, },
-     { "RDMA_GID_STATUS_CHANGED", qemuMonitorJSONHandleRdmaGidStatusChanged, },
-@@ -1044,6 +1046,20 @@ qemuMonitorJSONHandleNetdevStreamDisconnected(qemuMonitor *mon, virJSONValue *da
- }
- 
- 
-+static void
-+qemuMonitorJSONHandleNetdevVhostUserDisconnected(qemuMonitor *mon, virJSONValue *data)
-+{
-+    const char *name;
-+
-+    if (!(name = virJSONValueObjectGetString(data, "netdev-id"))) {
-+        VIR_WARN("missing device in NETDEV_VHOST_USER_DISCONNECTED event");
-+        return;
-+    }
-+
-+    qemuMonitorEmitNetdevVhostUserDisconnected(mon, name);
-+}
-+
-+
- static void
- qemuMonitorJSONHandleNicRxFilterChanged(qemuMonitor *mon, virJSONValue *data)
- {
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index ad7e99750f..2076ad8208 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -1402,6 +1402,23 @@ qemuProcessHandleNetdevStreamDisconnected(qemuMonitor *mon G_GNUC_UNUSED,
- }
- 
- 
-+static void
-+qemuProcessHandleNetdevVhostUserDisconnected(qemuMonitor *mon G_GNUC_UNUSED,
-+                                             virDomainObj *vm,
-+                                             const char *devAlias)
-+{
-+    virObjectLock(vm);
-+
-+    VIR_DEBUG("Device %s Netdev vhost-user Disconnected in domain %p %s",
-+              devAlias, vm, vm->def->name);
-+
-+    qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_NETDEV_VHOST_USER_DISCONNECTED,
-+                           0, 0, g_strdup(devAlias));
-+
-+    virObjectUnlock(vm);
-+}
-+
-+
- static void
- qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon G_GNUC_UNUSED,
-                                     virDomainObj *vm,
-@@ -1848,6 +1865,7 @@ static qemuMonitorCallbacks monitorCallbacks = {
-     .domainMemoryDeviceSizeChange = qemuProcessHandleMemoryDeviceSizeChange,
-     .domainDeviceUnplugError = qemuProcessHandleDeviceUnplugErr,
-     .domainNetdevStreamDisconnected = qemuProcessHandleNetdevStreamDisconnected,
-+    .domainNetdevVhostUserDisconnected = qemuProcessHandleNetdevVhostUserDisconnected,
- };
- 
- static void
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-sanitize-blank-lines-in-config-file.patch b/SOURCES/libvirt-qemu-sanitize-blank-lines-in-config-file.patch
deleted file mode 100644
index 5d58a90..0000000
--- a/SOURCES/libvirt-qemu-sanitize-blank-lines-in-config-file.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-From 6921381e6831f942029b922e6f0ef6b7ca0c6c58 Mon Sep 17 00:00:00 2001
-Message-ID: <6921381e6831f942029b922e6f0ef6b7ca0c6c58.1755522824.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 16 Jul 2025 16:30:52 +0100
-Subject: [PATCH] qemu: sanitize blank lines in config file
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We mostly use 2 blank lines between config file entries to
-improve readability. Fix where we don't do that.
-
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 0b9cfa791f2bd135ea36fe03fd1a8d6c8bf5e3d6)
-
-Resolves: https://issues.redhat.com/browse/RHEL-106276
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/qemu/qemu.conf.in | 41 ++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 38 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in
-index 3365834200..988d176a28 100644
---- a/src/qemu/qemu.conf.in
-+++ b/src/qemu/qemu.conf.in
-@@ -48,7 +48,7 @@
- #
- #default_tls_x509_verify = 1
- 
--#
-+
- # Libvirt assumes the server-key.pem file is unencrypted by default.
- # To use an encrypted server-key.pem file, the password to decrypt
- # the PEM file is required. This can be provided by creating a secret
-@@ -71,6 +71,7 @@
- #
- #vnc_listen = "0.0.0.0"
- 
-+
- # Enable this option to have VNC served over an automatically created
- # unix socket. This prevents unprivileged access from users on the
- # host machine, though most VNC clients do not support it.
-@@ -81,6 +82,7 @@
- #
- #vnc_auto_unix_socket = 1
- 
-+
- # Enable use of TLS encryption on the VNC server. This requires
- # a VNC client which supports the VeNCrypt protocol extension.
- # Examples include vinagre, virt-viewer, virt-manager and vencrypt
-@@ -222,6 +224,7 @@
- #
- #spice_sasl = 1
- 
-+
- # The default SASL configuration file is located in /etc/sasl2/
- # When running libvirtd unprivileged, it may be desirable to
- # override the configs in this location. Set this parameter to
-@@ -229,6 +232,7 @@
- #
- #spice_sasl_dir = "/some/directory/sasl2"
- 
-+
- # Enable use of TLS encryption on the chardev TCP transports.
- #
- # It is necessary to setup CA and issue a server certificate
-@@ -468,6 +472,7 @@
- #remote_display_port_min = 5900
- #remote_display_port_max = 65535
- 
-+
- # VNC WebSocket port policies, same rules apply as with remote display
- # ports.  VNC WebSockets use similar display <-> port mappings, with
- # the exception being that ports start from 5700 instead of 5900.
-@@ -475,6 +480,7 @@
- #remote_websocket_port_min = 5700
- #remote_websocket_port_max = 65535
- 
-+
- # The default security driver is SELinux. If SELinux is disabled
- # on the host, then the security driver will automatically disable
- # itself. If you wish to disable QEMU SELinux security driver while
-@@ -492,15 +498,18 @@
- #
- #security_driver = "selinux"
- 
-+
- # If set to non-zero, then the default security labeling
- # will make guests confined. If set to zero, then guests
- # will be unconfined by default. Defaults to 1.
- #security_default_confined = 1
- 
-+
- # If set to non-zero, then attempts to create unconfined
- # guests will be blocked. Defaults to 0.
- #security_require_confined = 1
- 
-+
- # The user for QEMU processes run by the system instance. It can be
- # specified as a user name or as a user id. The qemu driver will try to
- # parse this value first as a name and then, if the name doesn't exist,
-@@ -518,20 +527,24 @@
- #
- #user = "@QEMU_USER@"
- 
-+
- # The group for QEMU processes run by the system instance. It can be
- # specified in a similar way to user.
- #group = "@QEMU_GROUP@"
- 
-+
- # Whether libvirt should dynamically change file ownership
- # to match the configured user/group above. Defaults to 1.
- # Set to 0 to disable file ownership changes.
- #dynamic_ownership = 1
- 
-+
- # Whether libvirt should remember and restore the original
- # ownership over files it is relabeling. Defaults to 1, set
- # to 0 to disable the feature.
- #remember_owner = 1
- 
-+
- # What cgroup controllers to make use of with QEMU guests
- #
- #  - 'cpu' - use for scheduler tunables
-@@ -553,6 +566,7 @@
- #
- #cgroup_controllers = [ "cpu", "devices", "memory", "blkio", "cpuset", "cpuacct" ]
- 
-+
- # This is the basic set of devices allowed / required by
- # all virtual machines.
- #
-@@ -612,12 +626,14 @@
- #dump_image_format = "raw"
- #snapshot_image_format = "raw"
- 
-+
- # When a domain is configured to be auto-dumped when libvirtd receives a
- # watchdog event from qemu guest, libvirtd will save dump files in directory
- # specified by auto_dump_path. Default value is /var/lib/libvirt/qemu/dump
- #
- #auto_dump_path = "/var/lib/libvirt/qemu/dump"
- 
-+
- # When a domain is configured to be auto-dumped, enabling this flag
- # has the same effect as using the VIR_DUMP_BYPASS_CACHE flag with the
- # virDomainCoreDump API.  That is, the system will avoid using the
-@@ -626,6 +642,7 @@
- #
- #auto_dump_bypass_cache = 0
- 
-+
- # When a domain is configured to be auto-started, enabling this flag
- # has the same effect as using the VIR_DOMAIN_START_BYPASS_CACHE flag
- # with the virDomainCreateWithFlags API.  That is, the system will
-@@ -634,6 +651,7 @@
- #
- #auto_start_bypass_cache = 0
- 
-+
- # If provided by the host and a hugetlbfs mount point is configured,
- # a guest may request huge page backing.  When this mount point is
- # unspecified here, determination of a host mount point in /proc/mounts
-@@ -682,6 +700,7 @@
- #max_processes = 0
- #max_files = 0
- 
-+
- # If max_threads_per_process is set to a positive integer, libvirt
- # will use it to set the maximum number of threads that can be
- # created by a qemu process. Some VM configurations can result in
-@@ -692,6 +711,7 @@
- #
- #max_threads_per_process = 0
- 
-+
- # If max_core is set to a non-zero integer, then QEMU will be
- # permitted to create core dumps when it crashes, provided its
- # RAM size is smaller than the limit set.
-@@ -716,6 +736,7 @@
- #
- #max_core = "unlimited"
- 
-+
- # Determine if guest RAM is included in QEMU core dumps. By
- # default guest RAM will be excluded if a new enough QEMU is
- # present and host kernel supports it. Setting this to '1' will
-@@ -726,6 +747,7 @@
- #
- #dump_guest_core = 1
- 
-+
- # mac_filter enables MAC addressed based filtering on bridge ports.
- # This currently requires ebtables to be installed.
- #
-@@ -755,6 +777,7 @@
- #
- #max_queued = 0
- 
-+
- ###################################################################
- # Keepalive protocol:
- # This allows qemu driver to detect broken connections to remote
-@@ -778,7 +801,6 @@
- #keepalive_count = 5
- 
- 
--
- # Use seccomp syscall filtering sandbox in QEMU.
- # 1 == filter enabled, 0 == filter disabled
- #
-@@ -813,7 +835,6 @@
- #migration_port_max = 49215
- 
- 
--
- # Timestamp QEMU's log messages (if QEMU supports it)
- #
- # Defaults to 1.
-@@ -853,6 +874,7 @@
- #   "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd"
- #]
- 
-+
- # The backend to use for handling stdout/stderr output from
- # QEMU processes.
- #
-@@ -868,6 +890,7 @@
- #
- #stdio_handler = "logd"
- 
-+
- # QEMU gluster libgfapi log level, debug levels are 0-9, with 9 being the
- # most verbose, and 0 representing no debugging output.
- #
-@@ -888,6 +911,7 @@
- #
- #gluster_debug_level = 9
- 
-+
- # virtiofsd debug
- #
- # Whether to enable the debugging output of the virtiofsd daemon.
-@@ -895,6 +919,7 @@
- #
- #virtiofsd_debug = 1
- 
-+
- # To enhance security, QEMU driver is capable of creating private namespaces
- # for each domain started. Well, so far only "mount" namespace is supported. If
- # enabled it means qemu process is unable to see all the devices on the system,
-@@ -903,24 +928,29 @@
- # by default.
- #namespaces = [ "mount" ]
- 
-+
- # This directory is used for memoryBacking source if configured as file.
- # NOTE: big files will be stored here
- #memory_backing_dir = "/var/lib/libvirt/qemu/ram"
- 
-+
- # Path to the SCSI persistent reservations helper. This helper is
- # used whenever <reservations/> are enabled for SCSI LUN devices.
- # If this is not an absolute path, the program will be searched for
- # in $PATH as well as a few additional directories.
- #pr_helper = "qemu-pr-helper"
- 
-+
- # Path to the SLIRP networking helper.
- #slirp_helper = "/usr/bin/slirp-helper"
- 
-+
- # Path to the dbus-daemon
- # If this is not an absolute path, the program will be searched for
- # in $PATH.
- #dbus_daemon = "dbus-daemon"
- 
-+
- # User for the swtpm TPM Emulator
- #
- # Default is 'tss'; this is the same user that tcsd (TrouSerS) installs
-@@ -929,6 +959,7 @@
- #swtpm_user = "tss"
- #swtpm_group = "tss"
- 
-+
- # For debugging and testing purposes it's sometimes useful to be able to disable
- # libvirt behaviour based on the capabilities of the qemu process. This option
- # allows to do so. DO _NOT_ use in production and beaware that the behaviour
-@@ -936,6 +967,7 @@
- #
- #capability_filters = [ "capname" ]
- 
-+
- # 'deprecation_behavior' setting controls how the qemu process behaves towards
- # deprecated commands and arguments used by libvirt.
- #
-@@ -967,6 +999,7 @@
- #
- #deprecation_behavior = "none"
- 
-+
- # If this is set then QEMU and its threads will run in a separate scheduling
- # group meaning no other process will share Hyper Threads of a single core with
- # QEMU. Each QEMU has its own group.
-@@ -983,6 +1016,7 @@
- #              scheduling group
- #sched_core = "none"
- 
-+
- # Using nbdkit to access remote disk sources
- #
- # If this is set then libvirt will use nbdkit to access remote disk sources
-@@ -994,6 +1028,7 @@
- #
- #storage_use_nbdkit = @USE_NBDKIT_DEFAULT@
- 
-+
- # libvirt will normally prevent migration if the storage backing the VM is not
- # on a shared filesystems. Sometimes, however, the storage *is* shared despite
- # not being detected as such: for example, this is the case when one of the
--- 
-2.50.1
diff --git a/SOURCES/libvirt-qemu-snapshot-Ensure-that-NVRAM-image-exists-when-taking-inactive-internal-snapshot.patch b/SOURCES/libvirt-qemu-snapshot-Ensure-that-NVRAM-image-exists-when-taking-inactive-internal-snapshot.patch
deleted file mode 100644
index d4f5dea..0000000
--- a/SOURCES/libvirt-qemu-snapshot-Ensure-that-NVRAM-image-exists-when-taking-inactive-internal-snapshot.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 45fe2375b04f05ff9f9cb0f84dd3c5408718353f Mon Sep 17 00:00:00 2001
-Message-ID: <45fe2375b04f05ff9f9cb0f84dd3c5408718353f.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 3 Feb 2025 17:52:50 +0100
-Subject: [PATCH] qemu: snapshot: Ensure that NVRAM image exists when taking
- inactive internal snapshot
-
-Attempting to take an internal snapshot of a freshly defined VM with
-qcow2 backed NVRAM results in failure as the NVRAM image doesn't get
-populated until the VM is started for the first time.
-
-Fix this by invoking qemuPrepareNVRAM() when qcow2 nvram is defined.
-
-Resolves: https://issues.redhat.com/browse/RHEL-73315
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 650e6fb7ebf905fe7dc992610ef9e932328460b7)
-
-https://issues.redhat.com/browse/RHEL-73315
----
- src/qemu/qemu_snapshot.c | 23 +++++++++++++++++++----
- 1 file changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
-index 7c998afe6f..b1f4ebb995 100644
---- a/src/qemu/qemu_snapshot.c
-+++ b/src/qemu/qemu_snapshot.c
-@@ -269,6 +269,7 @@ qemuSnapshotForEachQcow2One(virStorageSource *src,
- /**
-  * qemuSnapshotForEachQcow2:
-  *
-+ * @driver: qemu driver configuration
-  * @def: domain definition
-  * @snap: snapshot object
-  * @op: 'qemu-img snapshot' operation flag, one of "-c", "-d", "-a"
-@@ -282,7 +283,8 @@ qemuSnapshotForEachQcow2One(virStorageSource *src,
-  * permissive modes.
-  */
- static int
--qemuSnapshotForEachQcow2(virDomainDef *def,
-+qemuSnapshotForEachQcow2(virQEMUDriver *driver,
-+                         virDomainDef *def,
-                          virDomainMomentObj *snap,
-                          const char *op)
- {
-@@ -352,6 +354,16 @@ qemuSnapshotForEachQcow2(virDomainDef *def,
- 
-         if (virStorageSourceIsLocalStorage(nvram) &&
-             nvram->format == VIR_STORAGE_FILE_QCOW2) {
-+            if (create) {
-+                /* Ensure that the NVRAM image exists; e.g. when snapshotting
-+                 * a VM directly after defining it */
-+                if (qemuPrepareNVRAM(driver, def, false) < 0) {
-+                    nrollback = def->ndisks;
-+                    virErrorPreserveLast(&orig_err);
-+                    goto rollback;
-+                }
-+            }
-+
-             if (qemuSnapshotForEachQcow2One(nvram, op, snap->def->name) < 0) {
-                 if (create) {
-                     nrollback = def->ndisks;
-@@ -392,7 +404,8 @@ static int
- qemuSnapshotCreateInactiveInternal(virDomainObj *vm,
-                                    virDomainMomentObj *snap)
- {
--    return qemuSnapshotForEachQcow2(vm->def, snap, "-c");
-+    return qemuSnapshotForEachQcow2(QEMU_DOMAIN_PRIVATE(vm)->driver,
-+                                    vm->def, snap, "-c");
- }
- 
- 
-@@ -2696,7 +2709,8 @@ qemuSnapshotInternalRevertInactive(virDomainObj *vm,
-     }
- 
-     /* Try all disks, but report failure if we skipped any.  */
--    if (qemuSnapshotForEachQcow2(def, snap, "-a") != 0)
-+    if (qemuSnapshotForEachQcow2(QEMU_DOMAIN_PRIVATE(vm)->driver,
-+                                 def, snap, "-a") != 0)
-         return -1;
- 
-     return 0;
-@@ -4064,7 +4078,8 @@ qemuSnapshotDiscardImpl(virDomainObj *vm,
-                 if (qemuSnapshotDiscardExternal(vm, snap, externalData) < 0)
-                     return -1;
-             } else {
--                if (qemuSnapshotForEachQcow2(def, snap, "-d") < 0)
-+                if (qemuSnapshotForEachQcow2(QEMU_DOMAIN_PRIVATE(vm)->driver,
-+                                             def, snap, "-d") < 0)
-                     return -1;
-             }
-         } else {
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-snapshot-delete-disk-image-only-if-parent-snapshot-is-external.patch b/SOURCES/libvirt-qemu-snapshot-delete-disk-image-only-if-parent-snapshot-is-external.patch
deleted file mode 100644
index 18ce7ca..0000000
--- a/SOURCES/libvirt-qemu-snapshot-delete-disk-image-only-if-parent-snapshot-is-external.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From b617eb7d706e30ffd241d86898cb02d42ab8e817 Mon Sep 17 00:00:00 2001
-Message-ID: <b617eb7d706e30ffd241d86898cb02d42ab8e817.1737731143.git.jdenemar@redhat.com>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Thu, 9 Jan 2025 16:23:44 +0100
-Subject: [PATCH] qemu: snapshot: delete disk image only if parent snapshot is
- external
-
-When we are deleting external snapshot that is not active we only need
-to delete overlay disk image of the parent snapshot. This works
-correctly even if parent snapshot is external and active as it will have
-another overlay created when user reverted to that snapshot.
-
-In case the parent snapshot is internal there are no overlay disk images
-created as everything is stored internally within the disk image. In
-this case we would delete the actual disk image storing internal
-snapshots and most likely the original disk image as well resulting in
-data loss once the VM is shutoff.
-
-Fixes: https://gitlab.com/libvirt/libvirt/-/issues/734
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit d51179fa82448f4720f1645f0b7100df80508cc4)
-
-https://issues.redhat.com/browse/RHEL-74041
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
----
- src/qemu/qemu_snapshot.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
-index 18b2e478f6..80cd54bf33 100644
---- a/src/qemu/qemu_snapshot.c
-+++ b/src/qemu/qemu_snapshot.c
-@@ -3144,6 +3144,8 @@ qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm,
-             return -1;
-         }
- 
-+        data->parentSnap = qemuSnapshotFindParentSnapForDisk(snap, data->snapDisk);
-+
-         if (data->merge) {
-             virStorageSource *snapDiskSrc = NULL;
- 
-@@ -3185,8 +3187,6 @@ qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm,
-                 qemuSnapshotGetDisksWithBackingStore(vm, snap, data);
-             }
- 
--            data->parentSnap = qemuSnapshotFindParentSnapForDisk(snap, data->snapDisk);
--
-             if (data->parentSnap && !virDomainSnapshotIsExternal(data->parentSnap)) {
-                 virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                                _("deleting external snapshot that has internal snapshot as parent not supported"));
-@@ -3642,10 +3642,12 @@ qemuSnapshotDiscardExternal(virDomainObj *vm,
-             if (!data->job)
-                 goto error;
-         } else {
--            if (virStorageSourceInit(data->parentDomDisk->src) < 0 ||
--                virStorageSourceUnlink(data->parentDomDisk->src) < 0) {
--                VIR_WARN("Failed to remove snapshot image '%s'",
--                         data->snapDisk->name);
-+            if (data->parentSnap && virDomainSnapshotIsExternal(data->parentSnap)) {
-+                if (virStorageSourceInit(data->parentDomDisk->src) < 0 ||
-+                    virStorageSourceUnlink(data->parentDomDisk->src) < 0) {
-+                    VIR_WARN("Failed to remove snapshot image '%s'",
-+                             data->snapDisk->name);
-+                }
-             }
-         }
-     }
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-snapshot-error-out-early-when-reverting-snapshot-for-VM-with-non-file-disk.patch b/SOURCES/libvirt-qemu-snapshot-error-out-early-when-reverting-snapshot-for-VM-with-non-file-disk.patch
deleted file mode 100644
index 40c8120..0000000
--- a/SOURCES/libvirt-qemu-snapshot-error-out-early-when-reverting-snapshot-for-VM-with-non-file-disk.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From c9c9405687b78713b913c09113697fcadec1cdba Mon Sep 17 00:00:00 2001
-Message-ID: <c9c9405687b78713b913c09113697fcadec1cdba.1741876175.git.jdenemar@redhat.com>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Wed, 26 Feb 2025 11:04:52 +0100
-Subject: [PATCH] qemu: snapshot: error out early when reverting snapshot for
- VM with non-file disk
-
-Before this patch the code would start the revert process by destroying
-the VM and preparing to revert where it would fail with following error:
-
-    error: unsupported configuration: source for disk 'sdb' is not a regular file; refusing to generate external snapshot name
-
-and leaving user with offline VM even if it was running.
-
-Make the check before we start the revert process to not destroy VMs.
-
-Resolves: https://issues.redhat.com/browse/RHEL-30971
-Resolves: https://issues.redhat.com/browse/RHEL-79928
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 278b8334eb26aa9495f6d37e4f72471cbc8739a6)
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
----
- src/qemu/qemu_snapshot.c | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
-index 3a8510c69e..16d3aaf6e7 100644
---- a/src/qemu/qemu_snapshot.c
-+++ b/src/qemu/qemu_snapshot.c
-@@ -2190,6 +2190,8 @@ qemuSnapshotRevertValidate(virDomainObj *vm,
-                            virDomainSnapshotDef *snapdef,
-                            unsigned int flags)
- {
-+    size_t i;
-+
-     if (!vm->persistent &&
-         snapdef->state != VIR_DOMAIN_SNAPSHOT_RUNNING &&
-         snapdef->state != VIR_DOMAIN_SNAPSHOT_PAUSED &&
-@@ -2217,6 +2219,22 @@ qemuSnapshotRevertValidate(virDomainObj *vm,
-         }
-     }
- 
-+    /* Reverting to external snapshot creates overlay files for every disk and
-+     * it would fail for non-file based disks.
-+     * See qemuSnapshotRevertExternalPrepare for more details. */
-+    if (virDomainSnapshotIsExternal(snap)) {
-+        for (i = 0; i < snap->def->dom->ndisks; i++) {
-+            virDomainDiskDef *disk = snap->def->dom->disks[i];
-+
-+            if (disk->src->type != VIR_STORAGE_TYPE_FILE) {
-+                virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
-+                               _("source disk for '%1$s' is not a regular file, reverting to snapshot is not supported"),
-+                               disk->dst);
-+                return -1;
-+            }
-+        }
-+    }
-+
-     return 0;
- }
- 
-@@ -2368,6 +2386,9 @@ qemuSnapshotRevertExternalPrepare(virDomainObj *vm,
-     if (virDomainMomentDefPostParse(&tmpsnapdef->parent) < 0)
-         return -1;
- 
-+    /* Force default location to be external in order to create overlay files
-+     * for every disk. In qemuSnapshotRevertValidate we make sure that each
-+     * disk is regular file otherwise this would fail. */
-     if (virDomainSnapshotAlignDisks(tmpsnapdef, domdef,
-                                     VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL,
-                                     false, true) < 0) {
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-support-MSDM-ACPI-table-type.patch b/SOURCES/libvirt-qemu-support-MSDM-ACPI-table-type.patch
deleted file mode 100644
index bf5f77e..0000000
--- a/SOURCES/libvirt-qemu-support-MSDM-ACPI-table-type.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From d50549c9b0e601bc3a6ae5ee97d1ff2f75645f57 Mon Sep 17 00:00:00 2001
-Message-ID: <d50549c9b0e601bc3a6ae5ee97d1ff2f75645f57.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 17 Feb 2025 16:58:27 +0000
-Subject: [PATCH] qemu: support MSDM ACPI table type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The MSDM ACPI table is a replacement for the SLIC table type, now
-sometimes used by Microsoft for Windows Licensing checks:
-
-  https://learn.microsoft.com/en-us/previous-versions/windows/hardware/design/dn653305(v=vs.85)
-
-Resolves: https://gitlab.com/libvirt/libvirt/-/issues/748
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 288f90feb32e38dfd246cbfb68f38caca43cef70)
-Resolves: https://issues.redhat.com/browse/RHEL-81041
----
- docs/formatdomain.rst                                    | 2 +-
- src/qemu/qemu_command.c                                  | 2 +-
- src/qemu/qemu_validate.c                                 | 2 +-
- tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args | 1 +
- tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.xml  | 1 +
- tests/qemuxmlconfdata/acpi-table-many.xml                | 1 +
- 6 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index c144851b62..961d20a41d 100644
---- a/docs/formatdomain.rst
-+++ b/docs/formatdomain.rst
-@@ -500,7 +500,7 @@ These options apply to any form of booting of the guest OS.
-    * ``msdm``: a single ACPI table with header and data, providing
-      Microsoft Data Management information. The ACPI table signature
-      in the header will be forced to ``MSDM``
--     (:since:`Since 11.2.0`).
-+     (:since:`Since 11.2.0 (QEMU)`).
- 
-    Each type may be used only once, except for ``raw`` which can
-    appear multiple times.
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 9fe191d3b9..b7d61edd19 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -133,7 +133,7 @@ VIR_ENUM_IMPL(qemuACPITableSIG,
-               "", /* raw */
-               "", /* rawset */
-               "SLIC",
--              "");
-+              "MSDM");
- 
- 
- const char *
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index 378f502ea7..f814ee8c0d 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -731,10 +731,10 @@ qemuValidateDomainDefBoot(const virDomainDef *def,
-         switch (def->os.acpiTables[i]->type) {
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW:
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC:
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_MSDM:
-             break;
- 
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET:
--        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_MSDM:
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("ACPI table type '%1$s' is not supported"),
-                            virDomainOsACPITableTypeToString(def->os.acpiTables[i]->type));
-diff --git a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
-index 4d5d02cb3c..2b0b433258 100644
---- a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
-@@ -30,6 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
- -acpitable file=/var/lib/libvirt/acpi/exm2.dat \
- -acpitable file=/var/lib/libvirt/acpi/exm3.dat \
- -acpitable sig=SLIC,file=/var/lib/libvirt/acpi/slic.dat \
-+-acpitable sig=MSDM,file=/var/lib/libvirt/acpi/msdm.dat \
- -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
- -audiodev '{"id":"audio1","driver":"none"}' \
- -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-diff --git a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.xml b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.xml
-index b7f7e18d28..084bb4cda3 100644
---- a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.xml
-+++ b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.xml
-@@ -11,6 +11,7 @@
-       <table type='raw'>/var/lib/libvirt/acpi/exm2.dat</table>
-       <table type='raw'>/var/lib/libvirt/acpi/exm3.dat</table>
-       <table type='slic'>/var/lib/libvirt/acpi/slic.dat</table>
-+      <table type='msdm'>/var/lib/libvirt/acpi/msdm.dat</table>
-     </acpi>
-     <boot dev='hd'/>
-   </os>
-diff --git a/tests/qemuxmlconfdata/acpi-table-many.xml b/tests/qemuxmlconfdata/acpi-table-many.xml
-index cc75011990..890078d4c3 100644
---- a/tests/qemuxmlconfdata/acpi-table-many.xml
-+++ b/tests/qemuxmlconfdata/acpi-table-many.xml
-@@ -12,6 +12,7 @@
-       <table type='raw'>/var/lib/libvirt/acpi/exm2.dat</table>
-       <table type='raw'>/var/lib/libvirt/acpi/exm3.dat</table>
-       <table type='slic'>/var/lib/libvirt/acpi/slic.dat</table>
-+      <table type='msdm'>/var/lib/libvirt/acpi/msdm.dat</table>
-     </acpi>
-   </os>
-   <features>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-support-raw-ACPI-table-type.patch b/SOURCES/libvirt-qemu-support-raw-ACPI-table-type.patch
deleted file mode 100644
index 650183b..0000000
--- a/SOURCES/libvirt-qemu-support-raw-ACPI-table-type.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From b83e3e1644dc33a41fa4ccd62407aeca218bbd4c Mon Sep 17 00:00:00 2001
-Message-ID: <b83e3e1644dc33a41fa4ccd62407aeca218bbd4c.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 26 Feb 2025 19:10:42 +0000
-Subject: [PATCH] qemu: support 'raw' ACPI table type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows passing a single ACPI table of any type through to QEMU with
-the signture autodetected from the header.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit fe0cf62e0f8a6c4bbc2f297f46761f41691e3193)
-Resolves: https://issues.redhat.com/browse/RHEL-81041
----
- docs/formatdomain.rst                         |  2 +-
- src/qemu/qemu_command.c                       |  6 ++-
- src/qemu/qemu_validate.c                      |  2 +-
- .../acpi-table-many.x86_64-latest.args        | 36 ++++++++++++++++
- .../acpi-table-many.x86_64-latest.xml         | 41 +++++++++++++++++++
- tests/qemuxmlconfdata/acpi-table-many.xml     | 33 +++++++++++++++
- tests/qemuxmlconftest.c                       |  1 +
- 7 files changed, 117 insertions(+), 4 deletions(-)
- create mode 100644 tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
- create mode 100644 tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.xml
- create mode 100644 tests/qemuxmlconfdata/acpi-table-many.xml
-
-diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index b6e162235c..ff06efb69f 100644
---- a/docs/formatdomain.rst
-+++ b/docs/formatdomain.rst
-@@ -489,7 +489,7 @@ These options apply to any form of booting of the guest OS.
-    file:
- 
-    * ``raw``: a single ACPI table with header and data, with ACPI
--     signature auto-detected from header (:since:`Since 11.2.0`).
-+     signature auto-detected from header (:since:`Since 11.2.0 (QEMU)`).
-    * ``rawset``: concatenation of multiple ACPI tables with header
-      and data, each with any ACPI signature, auto-detected from header
-      (:since:`Since 11.2.0`).
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 94fb7fc4c2..adf7b21b14 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6011,9 +6011,11 @@ qemuBuildBootCommandLine(virCommand *cmd,
-         virCommandAddArgList(cmd, "-dtb", def->os.dtb, NULL);
-     for (i = 0; i < def->os.nacpiTables; i++) {
-         g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-+        const char *sig = qemuACPITableSIGTypeToString(def->os.acpiTables[i]->type);
-         virCommandAddArg(cmd, "-acpitable");
--        virBufferAsprintf(&buf, "sig=%s,file=",
--                          qemuACPITableSIGTypeToString(def->os.acpiTables[i]->type));
-+        if (*sig != '\0')
-+            virBufferAsprintf(&buf, "sig=%s,", sig);
-+        virBufferAddLit(&buf, "file=");
-         virQEMUBuildBufferEscapeComma(&buf, def->os.acpiTables[i]->path);
-         virCommandAddArgBuffer(cmd, &buf);
-     }
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index 8ef0257d73..b088e54dd0 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -729,10 +729,10 @@ qemuValidateDomainDefBoot(const virDomainDef *def,
- 
-     for (i = 0; i < def->os.nacpiTables; i++) {
-         switch (def->os.acpiTables[i]->type) {
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW:
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC:
-             break;
- 
--        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW:
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET:
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("ACPI table type '%1$s' is not supported"),
-diff --git a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
-new file mode 100644
-index 0000000000..4d5d02cb3c
---- /dev/null
-+++ b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
-@@ -0,0 +1,36 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-+USER=test \
-+LOGNAME=test \
-+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-+/usr/bin/qemu-system-x86_64 \
-+-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=on \
-+-accel tcg \
-+-cpu qemu64 \
-+-m size=219136k \
-+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-+-overcommit mem-lock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot strict=on \
-+-acpitable file=/var/lib/libvirt/acpi/exm1.dat \
-+-acpitable file=/var/lib/libvirt/acpi/exm2.dat \
-+-acpitable file=/var/lib/libvirt/acpi/exm3.dat \
-+-acpitable sig=SLIC,file=/var/lib/libvirt/acpi/slic.dat \
-+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
-+-audiodev '{"id":"audio1","driver":"none"}' \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.xml b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.xml
-new file mode 100644
-index 0000000000..b7f7e18d28
---- /dev/null
-+++ b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.xml
-@@ -0,0 +1,41 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219136</memory>
-+  <currentMemory unit='KiB'>219136</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='x86_64' machine='pc'>hvm</type>
-+    <acpi>
-+      <table type='raw'>/var/lib/libvirt/acpi/exm1.dat</table>
-+      <table type='raw'>/var/lib/libvirt/acpi/exm2.dat</table>
-+      <table type='raw'>/var/lib/libvirt/acpi/exm3.dat</table>
-+      <table type='slic'>/var/lib/libvirt/acpi/slic.dat</table>
-+    </acpi>
-+    <boot dev='hd'/>
-+  </os>
-+  <features>
-+    <acpi/>
-+  </features>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='forbid'>qemu64</model>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <controller type='usb' index='0' model='piix3-uhci'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-+    </controller>
-+    <controller type='ide' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <audio id='1' type='none'/>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconfdata/acpi-table-many.xml b/tests/qemuxmlconfdata/acpi-table-many.xml
-new file mode 100644
-index 0000000000..cc75011990
---- /dev/null
-+++ b/tests/qemuxmlconfdata/acpi-table-many.xml
-@@ -0,0 +1,33 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219136</memory>
-+  <currentMemory unit='KiB'>219136</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='x86_64' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+    <acpi>
-+      <table type='raw'>/var/lib/libvirt/acpi/exm1.dat</table>
-+      <table type='raw'>/var/lib/libvirt/acpi/exm2.dat</table>
-+      <table type='raw'>/var/lib/libvirt/acpi/exm3.dat</table>
-+      <table type='slic'>/var/lib/libvirt/acpi/slic.dat</table>
-+    </acpi>
-+  </os>
-+  <features>
-+    <acpi/>
-+  </features>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <controller type='usb' index='0'/>
-+    <controller type='ide' index='0'/>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index 3947f508a2..2007944c29 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -2767,6 +2767,7 @@ mymain(void)
-     DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-too-long-port-path-invalid");
- 
-     DO_TEST_CAPS_LATEST("acpi-table");
-+    DO_TEST_CAPS_LATEST("acpi-table-many");
- 
-     DO_TEST_CAPS_LATEST("intel-iommu");
-     DO_TEST_CAPS_LATEST("intel-iommu-caching-mode");
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu-tpm-Account-for-possible-migration-without-actually-sharing-storage.patch b/SOURCES/libvirt-qemu-tpm-Account-for-possible-migration-without-actually-sharing-storage.patch
new file mode 100644
index 0000000..bd7cb4c
--- /dev/null
+++ b/SOURCES/libvirt-qemu-tpm-Account-for-possible-migration-without-actually-sharing-storage.patch
@@ -0,0 +1,119 @@
+From 582ac1d5b308d1b9816c57ebca762a8796c67df4 Mon Sep 17 00:00:00 2001
+Message-ID: <582ac1d5b308d1b9816c57ebca762a8796c67df4.1766070256.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 1 Dec 2025 11:35:32 +0100
+Subject: [PATCH] qemu: tpm: Account for possible migration without actually
+ sharing storage
+
+The current logic in 'qemuTPMEmulatorBuildCommand' skips all setup if
+the *location* of the data is on what we'd consider shared storage.
+
+This means that if the location is not actually shared (e.g. it's shared
+betweeh some other hosts than the two doing the migration) and the path
+wasn't ever used (e.g. by migrating out) from the host where we're
+migrating into the complete setup of the location would be skipped even
+when it doesn't exist.
+
+Fix the logic by skipping only some of the setup steps so that
+'qemuTPMEmulatorCreateStorage' can still create the storage if it
+doesn't exist.
+
+The rest of the code then needs to take the 'created' flag returned from
+'qemuTPMEmulatorCreateStorage' into account.
+
+Fixes: 68103e9daf633b789428fedef56f816c92f6ee75
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit d56d0560946770d4364a4918cc289e6a7fe5d15c)
+https://issues.redhat.com/browse/RHEL-108915
+---
+ src/qemu/qemu_tpm.c | 29 ++++++++++++++++++++---------
+ 1 file changed, 20 insertions(+), 9 deletions(-)
+
+diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
+index 4c9445d72c..660410bcba 100644
+--- a/src/qemu/qemu_tpm.c
++++ b/src/qemu/qemu_tpm.c
+@@ -158,6 +158,7 @@ qemuTPMEmulatorGetPid(const char *swtpmStateDir,
+ /**
+  * qemuTPMEmulatorCreateStorage:
+  * @tpm: TPM definition for an emulator type
++ * @sharedStorageMigration: VM is being migrated with possibly shared storage
+  * @created: a pointer to a bool that will be set to true if the
+  *           storage was created because it did not exist yet
+  * @swtpm_user: The uid that needs to be able to access the directory
+@@ -169,6 +170,7 @@ qemuTPMEmulatorGetPid(const char *swtpmStateDir,
+  */
+ static int
+ qemuTPMEmulatorCreateStorage(virDomainTPMDef *tpm,
++                             bool sharedStorageMigration,
+                              bool *created,
+                              uid_t swtpm_user,
+                              gid_t swtpm_group)
+@@ -187,8 +189,17 @@ qemuTPMEmulatorCreateStorage(virDomainTPMDef *tpm,
+     *created = false;
+ 
+     if (!virFileExists(source_path) ||
+-        virDirIsEmpty(source_path, true) > 0)
++        virDirIsEmpty(source_path, true) > 0) {
+         *created = true;
++    } else {
++        /* If the location exists and is shared, we don't need to create it
++         * during migration */
++        if (sharedStorageMigration) {
++            VIR_DEBUG("Skipping TPM storage creation. Path '%s' already exists and is on shared storage.",
++                      source_path);
++            return 0;
++        }
++    }
+ 
+     if (virDirCreate(source_path, 0700, swtpm_user, swtpm_group,
+                      VIR_DIR_CREATE_ALLOW_EXIST) < 0) {
+@@ -809,16 +820,13 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm,
+         run_setup = true;
+     }
+ 
+-    /* Do not create storage and run swtpm_setup on incoming migration over
+-     * shared storage
+-     */
+     on_shared_storage = virFileIsSharedFS(tpm->data.emulator.source_path,
+                                           cfg->sharedFilesystems) == 1;
+-    if (incomingMigration && on_shared_storage)
+-        create_storage = false;
+ 
+     if (create_storage) {
+-        if (qemuTPMEmulatorCreateStorage(tpm, &created,
++        if (qemuTPMEmulatorCreateStorage(tpm,
++                                         incomingMigration && on_shared_storage,
++                                         &created,
+                                          cfg->swtpm_user, cfg->swtpm_group) < 0)
+             return NULL;
+         run_setup = created;
+@@ -885,6 +893,9 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm,
+     /* If swtpm supports it and the TPM state is stored on shared storage,
+      * start swtpm with --migration release-lock-outgoing so it can migrate
+      * across shared storage if needed.
++     *
++     * Note that if 'created' is true, the location didn't exist so the storage
++     * is not actually shared.
+      */
+     QEMU_DOMAIN_TPM_PRIVATE(tpm)->swtpm.can_migrate_shared_storage = false;
+     if (on_shared_storage &&
+@@ -892,13 +903,13 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm,
+ 
+         virCommandAddArg(cmd, "--migration");
+         virCommandAddArgFormat(cmd, "release-lock-outgoing%s",
+-                               incomingMigration ? ",incoming": "");
++                               incomingMigration && !created ? ",incoming": "");
+         QEMU_DOMAIN_TPM_PRIVATE(tpm)->swtpm.can_migrate_shared_storage = true;
+     } else {
+         /* Report an error if there's an incoming migration across shared
+          * storage and swtpm does not support the --migration option.
+          */
+-        if (incomingMigration && on_shared_storage) {
++        if (incomingMigration && on_shared_storage && !created) {
+             virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
+                            _("%1$s (on destination side) does not support the --migration option needed for migration with shared storage"),
+                            swtpm);
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemu-tpm-do-not-update-profile-name-for-transient-domains.patch b/SOURCES/libvirt-qemu-tpm-do-not-update-profile-name-for-transient-domains.patch
deleted file mode 100644
index d483c22..0000000
--- a/SOURCES/libvirt-qemu-tpm-do-not-update-profile-name-for-transient-domains.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From c184ba489a432d5748c3de3ff5719ccd8194c1e5 Mon Sep 17 00:00:00 2001
-Message-ID: <c184ba489a432d5748c3de3ff5719ccd8194c1e5.1734433245.git.jdenemar@redhat.com>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 3 Dec 2024 12:00:08 +0100
-Subject: [PATCH] qemu: tpm: do not update profile name for transient domains
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If we do not have a persistent definition, there's no point in
-looking for it since we cannot store it.
-
-Also skip the update if the tpm device(s) in the persistent
-definition are different.
-
-This fixes the crash when starting a transient domain.
-
-https://issues.redhat.com/browse/RHEL-69774
-https://gitlab.com/libvirt/libvirt/-/issues/715
-
-Fixes: d79542eec669eb9c449bb8228179e7a87e768017
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
-(cherry picked from commit 81da7a2c2a2d490cddaaa77d3e3b36e210b38bd7)
-
-https://issues.redhat.com/browse/RHEL-71072
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_extdevice.c | 13 ++++++++++++-
- src/qemu/qemu_tpm.c       |  2 +-
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
-index a6f31f9773..954cb323a4 100644
---- a/src/qemu/qemu_extdevice.c
-+++ b/src/qemu/qemu_extdevice.c
-@@ -190,7 +190,18 @@ qemuExtDevicesStart(virQEMUDriver *driver,
- 
-     for (i = 0; i < def->ntpms; i++) {
-         virDomainTPMDef *tpm = def->tpms[i];
--        virDomainTPMDef *persistentTPMDef = persistentDef->tpms[i];
-+        virDomainTPMDef *persistentTPMDef = NULL;
-+
-+        if (persistentDef) {
-+            /* do not try to update the profile in the persistent definition
-+             * if the device does not match */
-+            if (persistentDef->ntpms == def->ntpms)
-+                persistentTPMDef = persistentDef->tpms[i];
-+            if (persistentTPMDef &&
-+                (persistentTPMDef->type != tpm->type ||
-+                 persistentTPMDef->model != tpm->model))
-+                persistentTPMDef = NULL;
-+        }
- 
-         if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR &&
-             qemuExtTPMStart(driver, vm, tpm, persistentTPMDef,
-diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
-index f223dcb9ae..f5e0184e54 100644
---- a/src/qemu/qemu_tpm.c
-+++ b/src/qemu/qemu_tpm.c
-@@ -773,7 +773,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm,
-                                 incomingMigration) < 0)
-         goto error;
- 
--    if (run_setup && !incomingMigration &&
-+    if (run_setup && !incomingMigration && persistentTPMDef &&
-         qemuTPMEmulatorUpdateProfileName(&tpm->data.emulator, persistentTPMDef,
-                                          cfg, saveDef) < 0)
-         goto error;
--- 
-2.47.1
diff --git a/SOURCES/libvirt-qemu-use-switch-instead-of-if-in-qemuProcessPrepareDomainNetwork.patch b/SOURCES/libvirt-qemu-use-switch-instead-of-if-in-qemuProcessPrepareDomainNetwork.patch
deleted file mode 100644
index 9d8c89c..0000000
--- a/SOURCES/libvirt-qemu-use-switch-instead-of-if-in-qemuProcessPrepareDomainNetwork.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From cf77e1956a7d128b379f3608d38ec93c424c3ca2 Mon Sep 17 00:00:00 2001
-Message-ID: <cf77e1956a7d128b379f3608d38ec93c424c3ca2.1739824249.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Tue, 11 Feb 2025 16:30:11 -0500
-Subject: [PATCH] qemu: use switch instead of if in
- qemuProcessPrepareDomainNetwork()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-qemuProcessPrepareDomain()'s comments say that it should be the only
-place to change the "live XML" of a domain (i.e. the public parts of
-the virDomainDef object that is shown in the domain's status
-XML), and that seems like a reasonable idea (although there aren't
-many users of it to date).
-
-qemuProcessPrepareDomainNetwork() is called by the aforementioned
-qemuProcessPrepareDomain() - this patch changes the "if (type ==
-HOSTDEV)" in that function to a "switch(type)" so it's simpler to add
-DomainDef modifications for various other types of virDomainNetDef,
-and also so that anyone who adds a new interface type is forced to
-look at the code and decide if anything needs to be done here for the
-new type.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 6fe3d765e506b2954931e228ecd233f1200dce1a)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/qemu/qemu_process.c | 75 ++++++++++++++++++++++++++---------------
- 1 file changed, 47 insertions(+), 28 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index a45f1b5b7d..26ca943dfc 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5888,7 +5888,6 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm)
- 
-     for (i = 0; i < def->nnets; i++) {
-         virDomainNetDef *net = def->nets[i];
--        virDomainNetType actualType;
- 
-         /* If appropriate, grab a physical device from the configured
-          * network's pool of devices, or resolve bridge device name
-@@ -5901,36 +5900,56 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm)
-                 return -1;
-         }
- 
--        actualType = virDomainNetGetActualType(net);
--        if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV &&
--            net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
--            /* Each type='hostdev' network device must also have a
--             * corresponding entry in the hostdevs array. For netdevs
--             * that are hardcoded as type='hostdev', this is already
--             * done by the parser, but for those allocated from a
--             * network / determined at runtime, we need to do it
--             * separately.
--             */
--            virDomainHostdevDef *hostdev = virDomainNetGetActualHostdev(net);
--            virDomainHostdevSubsysPCI *pcisrc = &hostdev->source.subsys.u.pci;
--
--            if (virDomainHostdevFind(def, hostdev, NULL) >= 0) {
--                virReportError(VIR_ERR_INTERNAL_ERROR,
--                               _("PCI device %1$04x:%2$02x:%3$02x.%4$x allocated from network %5$s is already in use by domain %6$s"),
--                               pcisrc->addr.domain, pcisrc->addr.bus,
--                               pcisrc->addr.slot, pcisrc->addr.function,
--                               net->data.network.name, def->name);
--                return -1;
--            }
-+        switch (virDomainNetGetActualType(net)) {
-+        case VIR_DOMAIN_NET_TYPE_HOSTDEV:
-+            if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
-+                /* Each type='hostdev' network device must also have a
-+                 * corresponding entry in the hostdevs array. For netdevs
-+                 * that are hardcoded as type='hostdev', this is already
-+                 * done by the parser, but for those allocated from a
-+                 * network / determined at runtime, we need to do it
-+                 * separately.
-+                 */
-+                virDomainHostdevDef *hostdev = virDomainNetGetActualHostdev(net);
-+                virDomainHostdevSubsysPCI *pcisrc = &hostdev->source.subsys.u.pci;
-+
-+                if (virDomainHostdevFind(def, hostdev, NULL) >= 0) {
-+                    virReportError(VIR_ERR_INTERNAL_ERROR,
-+                                   _("PCI device %1$04x:%2$02x:%3$02x.%4$x allocated from network %5$s is already in use by domain %6$s"),
-+                                   pcisrc->addr.domain, pcisrc->addr.bus,
-+                                   pcisrc->addr.slot, pcisrc->addr.function,
-+                                   net->data.network.name, def->name);
-+                    return -1;
-+                }
- 
--            /* For hostdev present in qemuProcessPrepareDomain() phase this was
--             * done already, but this code runs after that, so we have to call
--             * it ourselves. */
--            if (qemuDomainPrepareHostdev(hostdev, priv) < 0)
--                return -1;
-+                /* For hostdev present in qemuProcessPrepareDomain() phase this was
-+                 * done already, but this code runs after that, so we have to call
-+                 * it ourselves. */
-+                if (qemuDomainPrepareHostdev(hostdev, priv) < 0)
-+                    return -1;
- 
--            virDomainHostdevInsert(def, hostdev);
-+                virDomainHostdevInsert(def, hostdev);
-+            }
-+            break;
-+
-+        case VIR_DOMAIN_NET_TYPE_DIRECT:
-+        case VIR_DOMAIN_NET_TYPE_BRIDGE:
-+        case VIR_DOMAIN_NET_TYPE_NETWORK:
-+        case VIR_DOMAIN_NET_TYPE_ETHERNET:
-+        case VIR_DOMAIN_NET_TYPE_USER:
-+        case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
-+        case VIR_DOMAIN_NET_TYPE_SERVER:
-+        case VIR_DOMAIN_NET_TYPE_CLIENT:
-+        case VIR_DOMAIN_NET_TYPE_MCAST:
-+        case VIR_DOMAIN_NET_TYPE_INTERNAL:
-+        case VIR_DOMAIN_NET_TYPE_UDP:
-+        case VIR_DOMAIN_NET_TYPE_VDPA:
-+        case VIR_DOMAIN_NET_TYPE_NULL:
-+        case VIR_DOMAIN_NET_TYPE_VDS:
-+        case VIR_DOMAIN_NET_TYPE_LAST:
-+            break;
-         }
-+
-     }
-     return 0;
- }
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu-validate-that-model-is-virtio-for-vhostuser-and-vdpa-interfaces-in-the-same-place.patch b/SOURCES/libvirt-qemu-validate-that-model-is-virtio-for-vhostuser-and-vdpa-interfaces-in-the-same-place.patch
deleted file mode 100644
index 8db0e1a..0000000
--- a/SOURCES/libvirt-qemu-validate-that-model-is-virtio-for-vhostuser-and-vdpa-interfaces-in-the-same-place.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 64f9ffd6ba6384c3ce11312e645dac6cb3cab27e Mon Sep 17 00:00:00 2001
-Message-ID: <64f9ffd6ba6384c3ce11312e645dac6cb3cab27e.1739824249.git.jdenemar@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Sun, 9 Feb 2025 18:46:00 -0500
-Subject: [PATCH] qemu: validate that model is virtio for vhostuser and vdpa
- interfaces in the same place
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Both vhostuser and vdpa interface types must use the virtio model in
-the guest (because part of the functionality is implemented in the
-guest virtio driver). Due to ["because that's the way it happened"]
-this has been validated for vhostuser in the hypervisor-agnostic
-validate function, but for vdpa it has been done in the QEMU-specific
-validate. Since these interface models are only supported by QEMU
-anyway, validate for both of them in the QEMU validation function.
-
-Take advantage of this change to switch to using
-virDomainNetIsVirtioModel(net) instead of "net->model ==
-VIR_DOMAIN_NET_MODEL_VIRTIO" (the former also matches
-...VIRTIO_TRANSITIONAL and ...VIRTIO_NON_TRANSITIONAL, so is more
-correct).
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 154d44a585c40d0b6cf3bae674da2a8ca11ddb95)
-
-https://issues.redhat.com/browse/RHEL-69455
-Signed-off-by: Laine Stump <laine@redhat.com>
----
- src/conf/domain_validate.c |  6 ------
- src/qemu/qemu_validate.c   | 11 ++++++-----
- 2 files changed, 6 insertions(+), 11 deletions(-)
-
-diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
-index 1034bb57f5..f56ff5b7bb 100644
---- a/src/conf/domain_validate.c
-+++ b/src/conf/domain_validate.c
-@@ -2180,12 +2180,6 @@ virDomainNetDefValidate(const virDomainNetDef *net)
- 
-     switch (net->type) {
-     case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
--        if (!virDomainNetIsVirtioModel(net)) {
--            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                           _("Wrong or no <model> 'type' attribute specified with <interface type='vhostuser'/>. vhostuser requires the virtio-net* frontend"));
--            return -1;
--        }
--
-         if (net->data.vhostuser->data.nix.listen &&
-             net->data.vhostuser->data.nix.reconnect.enabled == VIR_TRISTATE_BOOL_YES) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index 9310457cb1..841d320541 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -1808,17 +1808,18 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-                            _("vDPA devices are not supported with this QEMU binary"));
-             return -1;
-         }
-+    }
- 
--        if (net->model != VIR_DOMAIN_NET_MODEL_VIRTIO) {
-+    if (!virDomainNetIsVirtioModel(net)) {
-+        if (net->type == VIR_DOMAIN_NET_TYPE_VDPA ||
-+            net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--                           _("invalid model for interface of type '%1$s': '%2$s'"),
-+                           _("invalid model for interface of type '%1$s': '%2$s' - must be 'virtio'"),
-                            virDomainNetTypeToString(net->type),
-                            virDomainNetModelTypeToString(net->model));
-             return -1;
-         }
--    }
--
--    if (virDomainNetIsVirtioModel(net)) {
-+    } else {
-         if (net->driver.virtio.rx_queue_size) {
-             if (!VIR_IS_POW2(net->driver.virtio.rx_queue_size)) {
-                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuDomainBlockCopyCommon-Don-t-revoke-access-to-file-twice-on-failure.patch b/SOURCES/libvirt-qemuDomainBlockCopyCommon-Don-t-revoke-access-to-file-twice-on-failure.patch
deleted file mode 100644
index e4229ee..0000000
--- a/SOURCES/libvirt-qemuDomainBlockCopyCommon-Don-t-revoke-access-to-file-twice-on-failure.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From bedbe8dd400e242ad346910bc2bdbfb1e6969fdf Mon Sep 17 00:00:00 2001
-Message-ID: <bedbe8dd400e242ad346910bc2bdbfb1e6969fdf.1744876588.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 10 Apr 2025 16:18:29 +0200
-Subject: [PATCH] qemuDomainBlockCopyCommon: Don't revoke access to file twice
- on failure
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the copy job fails to start up when calling the 'blockdev-mirror'
-command the code would call qemuDomainStorageSourceChainAccessRevoke()
-twice; once right after the monitor call and the second time in the
-'endjob' section.
-
-Remove the one directly after the monitor call and let the common
-cleanup handle it.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 68a83cac64b90b7069e6213d70a2faadb552cb80)
-https://issues.redhat.com/browse/RHEL-7357
----
- src/qemu/qemu_driver.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 4c6eff9286..8a354a606a 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -14413,10 +14413,8 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
- 
-     virDomainAuditDisk(vm, NULL, mirror, "mirror", ret >= 0);
-     qemuDomainObjExitMonitor(vm);
--    if (ret < 0) {
--        qemuDomainStorageSourceChainAccessRevoke(driver, vm, mirror);
-+    if (ret < 0)
-         goto endjob;
--    }
- 
-     /* Update vm in place to match changes.  */
-     need_unlink = false;
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemuDomainSetBlockIoTuneField-Move-setting-of-group_name-out-of-the-loop.patch b/SOURCES/libvirt-qemuDomainSetBlockIoTuneField-Move-setting-of-group_name-out-of-the-loop.patch
new file mode 100644
index 0000000..375ed05
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSetBlockIoTuneField-Move-setting-of-group_name-out-of-the-loop.patch
@@ -0,0 +1,68 @@
+From 531c9abeb0483ed64adafdd0546d77b13d913445 Mon Sep 17 00:00:00 2001
+Message-ID: <531c9abeb0483ed64adafdd0546d77b13d913445.1769699807.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 16 Jan 2026 16:38:38 +0100
+Subject: [PATCH] qemuDomainSetBlockIoTuneField: Move setting of 'group_name'
+ out of the loop
+
+The refactor will simplify further change which will introduce another
+source for the group name.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit fa064375668df0e67b4d68fdfc4a386862026f3f)
+
+https://issues.redhat.com/browse/RHEL-141820 [rhel-10.2]
+https://issues.redhat.com/browse/RHEL-144010 [rhel-9.8]
+---
+ src/qemu/qemu_driver.c | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 194017a29a..ecfb65c535 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -15173,6 +15173,7 @@ qemuDomainSetBlockIoTuneFields(virDomainBlockIoTuneInfo *info,
+                                int *eventNparams,
+                                int *eventMaxparams)
+ {
++    const char *param_group_name = NULL;
+     size_t i;
+ 
+ #define SET_IOTUNE_FIELD(FIELD, BOOL, CONST) \
+@@ -15218,15 +15219,8 @@ qemuDomainSetBlockIoTuneFields(virDomainBlockIoTuneInfo *info,
+                          WRITE_IOPS_SEC_MAX);
+         SET_IOTUNE_FIELD(size_iops_sec, SIZE_IOPS, SIZE_IOPS_SEC);
+ 
+-        /* NB: Cannot use macro since this is a value.s not a value.ul */
+         if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME)) {
+-            info->group_name = g_strdup(param->value.s);
+-            *set_fields |= QEMU_BLOCK_IOTUNE_SET_GROUP_NAME;
+-            if (virTypedParamsAddString(eventParams, eventNparams,
+-                                        eventMaxparams,
+-                                        VIR_DOMAIN_TUNABLE_BLKDEV_GROUP_NAME,
+-                                        param->value.s) < 0)
+-                return -1;
++            param_group_name = param->value.s;
+             continue;
+         }
+ 
+@@ -15244,6 +15238,16 @@ qemuDomainSetBlockIoTuneFields(virDomainBlockIoTuneInfo *info,
+                          WRITE_IOPS_SEC_MAX_LENGTH);
+     }
+ 
++    if (param_group_name) {
++        info->group_name = g_strdup(param_group_name);
++        *set_fields |= QEMU_BLOCK_IOTUNE_SET_GROUP_NAME;
++        if (virTypedParamsAddString(eventParams, eventNparams,
++                                    eventMaxparams,
++                                    VIR_DOMAIN_TUNABLE_BLKDEV_GROUP_NAME,
++                                    param_group_name) < 0)
++            return -1;
++    }
++
+ #undef SET_IOTUNE_FIELD
+ 
+     return 0;
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemuDomainSetThrottleGroup-Always-honour-thottle-group-name-passed-as-argument.patch b/SOURCES/libvirt-qemuDomainSetThrottleGroup-Always-honour-thottle-group-name-passed-as-argument.patch
new file mode 100644
index 0000000..9f58bb6
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSetThrottleGroup-Always-honour-thottle-group-name-passed-as-argument.patch
@@ -0,0 +1,75 @@
+From a32dfdf78ac0051b3f2c218272c2baa253ffa239 Mon Sep 17 00:00:00 2001
+Message-ID: <a32dfdf78ac0051b3f2c218272c2baa253ffa239.1769699807.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 16 Jan 2026 16:39:40 +0100
+Subject: [PATCH] qemuDomainSetThrottleGroup: Always honour thottle group name
+ passed as argument
+
+Due to the code share with 'qemuDomainSetBlockIoTune' the throttle group
+setting code accepts the throttle group name also via typed parameters.
+
+In 'qemuDomainSetThrottleGroup', this means that there are 2 ways to
+pass it the throttle group name and both are handled slightly
+differently. Specifically the name of the group used in the list of
+groups is the name taken from the typed parameters rather than the one
+passed via API. We also don't validate that they match.
+
+Now if the name in the typed parameters is missing we'd add empty string
+to the group list which would later crash when looking up the group
+name.
+
+To avoid this problem always use the name passed via argument. This is
+achieved by passing it into 'qemuDomainSetBlockIoTuneFields' so that it
+overrides whatever is in the typed parameters.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 0cd13906dcf15ea5709a7b253466816a1b875640)
+
+https://issues.redhat.com/browse/RHEL-141820 [rhel-10.2]
+https://issues.redhat.com/browse/RHEL-144010 [rhel-9.8]
+---
+ src/qemu/qemu_driver.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index ecfb65c535..a6d5dd6e05 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -15168,6 +15168,7 @@ static int
+ qemuDomainSetBlockIoTuneFields(virDomainBlockIoTuneInfo *info,
+                                virTypedParameterPtr params,
+                                int nparams,
++                               const char *group_name,
+                                qemuBlockIoTuneSetFlags *set_fields,
+                                virTypedParameterPtr *eventParams,
+                                int *eventNparams,
+@@ -15238,6 +15239,10 @@ qemuDomainSetBlockIoTuneFields(virDomainBlockIoTuneInfo *info,
+                          WRITE_IOPS_SEC_MAX_LENGTH);
+     }
+ 
++    /* The name of the throttle group passed via API always takes precedence */
++    if (group_name)
++        param_group_name = group_name;
++
+     if (param_group_name) {
+         info->group_name = g_strdup(param_group_name);
+         *set_fields |= QEMU_BLOCK_IOTUNE_SET_GROUP_NAME;
+@@ -15385,6 +15390,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
+     if (qemuDomainSetBlockIoTuneFields(&info,
+                                        params,
+                                        nparams,
++                                       NULL,
+                                        &set_fields,
+                                        &eventParams,
+                                        &eventNparams,
+@@ -20379,6 +20385,7 @@ qemuDomainSetThrottleGroup(virDomainPtr dom,
+     if (qemuDomainSetBlockIoTuneFields(&info,
+                                        params,
+                                        nparams,
++                                       groupname,
+                                        &set_fields,
+                                        &eventParams,
+                                        &eventNparams,
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemuDomainSetThrottleGroup-Don-t-put-group-name-into-the-tunable-event-twice.patch b/SOURCES/libvirt-qemuDomainSetThrottleGroup-Don-t-put-group-name-into-the-tunable-event-twice.patch
new file mode 100644
index 0000000..0e7a2d4
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSetThrottleGroup-Don-t-put-group-name-into-the-tunable-event-twice.patch
@@ -0,0 +1,43 @@
+From 537bc39e12472a9cd9bdaa149e680caa4eb7d5f2 Mon Sep 17 00:00:00 2001
+Message-ID: <537bc39e12472a9cd9bdaa149e680caa4eb7d5f2.1769699807.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 16 Jan 2026 16:39:49 +0100
+Subject: [PATCH] qemuDomainSetThrottleGroup: Don't put group name into the
+ 'tunable' event twice
+
+'qemuDomainSetBlockIoTuneFields' already populates the contents of the
+VIR_DOMAIN_EVENT_ID_TUNABLE params with the group name so there's no
+need to do it explicitly. We'd report the group name twice:
+
+ event 'tunable' for domain 'cd':
+	blkdeviotune.group_name: asdf
+	blkdeviotune.total_bytes_sec: 1234
+	blkdeviotune.group_name: asdf
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit adcc14e1538433ec1b2f4b103cdf641917e63242)
+
+https://issues.redhat.com/browse/RHEL-141820 [rhel-10.2]
+https://issues.redhat.com/browse/RHEL-144010 [rhel-9.8]
+---
+ src/qemu/qemu_driver.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index a6d5dd6e05..08a547c546 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -20378,10 +20378,6 @@ qemuDomainSetThrottleGroup(virDomainPtr dom,
+     if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
+         goto endjob;
+ 
+-    if (virTypedParamsAddString(&eventParams, &eventNparams, &eventMaxparams,
+-                                VIR_DOMAIN_TUNABLE_BLKDEV_GROUP_NAME, groupname) < 0)
+-        goto endjob;
+-
+     if (qemuDomainSetBlockIoTuneFields(&info,
+                                        params,
+                                        nparams,
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemuDomainSetThrottleGroup-Enforce-non-zero-groupname-string-length.patch b/SOURCES/libvirt-qemuDomainSetThrottleGroup-Enforce-non-zero-groupname-string-length.patch
new file mode 100644
index 0000000..c6d0945
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSetThrottleGroup-Enforce-non-zero-groupname-string-length.patch
@@ -0,0 +1,38 @@
+From 9b395b3de68aacda18bbb40f8bfba8f85087aec1 Mon Sep 17 00:00:00 2001
+Message-ID: <9b395b3de68aacda18bbb40f8bfba8f85087aec1.1769699807.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 16 Jan 2026 16:36:50 +0100
+Subject: [PATCH] qemuDomainSetThrottleGroup: Enforce non-zero 'groupname'
+ string length
+
+Having a name of 0 characters makes no sense. Reject it.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit abcdc9511b1c78df7dcdee9f01c6d55651d3a424)
+
+https://issues.redhat.com/browse/RHEL-141820 [rhel-10.2]
+https://issues.redhat.com/browse/RHEL-144010 [rhel-9.8]
+---
+ src/qemu/qemu_driver.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index f2e024dae3..194017a29a 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -20345,6 +20345,12 @@ qemuDomainSetThrottleGroup(virDomainPtr dom,
+     virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
+                   VIR_DOMAIN_AFFECT_CONFIG, -1);
+ 
++    if (strlen(groupname) == 0) {
++        virReportError(VIR_ERR_INVALID_ARG, "%s",
++                       _("'groupname' parameter string must have non-zero length"));
++        return -1;
++    }
++
+     if (qemuDomainValidateBlockIoTune(params, nparams) < 0)
+         return -1;
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemuMigrationDstPrepareAnyBlockDirtyBitmaps-Always-consider-offered-bitmaps.patch b/SOURCES/libvirt-qemuMigrationDstPrepareAnyBlockDirtyBitmaps-Always-consider-offered-bitmaps.patch
new file mode 100644
index 0000000..2e3f32c
--- /dev/null
+++ b/SOURCES/libvirt-qemuMigrationDstPrepareAnyBlockDirtyBitmaps-Always-consider-offered-bitmaps.patch
@@ -0,0 +1,98 @@
+From 73e383336be99821e588ef0fb8a6da8ad9fa7414 Mon Sep 17 00:00:00 2001
+Message-ID: <73e383336be99821e588ef0fb8a6da8ad9fa7414.1770203323.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 27 Jan 2026 17:28:48 +0100
+Subject: [PATCH] qemuMigrationDstPrepareAnyBlockDirtyBitmaps: Always consider
+ offered bitmaps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Consider bitmaps for incoming migration regardless of non-shared storage
+flag.
+
+When bitmaps are offered from the source, consult the local image if the
+bitmap is present and if not accept migration. Migration of bitmaps
+which exist in the qcow2 metadata is skipped because qemu rejects such
+setup (although handles it correctly in case of shared storage setup;
+see below).
+
+This allows bitmap propagation for cases when the qcow2 image is not
+actually shared between destinations but the data is (using the
+data_file feature).
+
+At the same time this preserves existing bitmap handling semantics for
+other cases. Specifically qemu, in case of shared storage properly
+propagates the bitmap which was already recorded in the qcow2 metadata
+on disk even if libvirt doesn't instruct migration, yet tolerates
+migration instruction if the file is not yet recorded in the on-disk
+metadata. In both cases the contents are preserved correctly.
+
+When storage is not shared (which includes even cases when we migrate
+it via NBD) it's expected that the bitmaps don't exist on the
+destination and thus all will be picked for migration. We can also
+infer that this wasn't ever a problem by the fact that the code skipping
+migration of existing bitmaps was broken until recently, and qemu
+would refuse such config.
+
+I've tested all the above scenarios including verifying that the
+resulting bitmaps capture dirtied regions before and after migration.
+For testing this the following command is useful:
+
+  virsh qemu-monitor-command --domain DOMNAME --hmp 'qemu-io -d /machine/peripheral/virtio-disk0/virtio-backend "write -P 0xcc 4M 1M"'
+
+Which simulates a write from the guest side without the need to interact
+with the guest OS.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit bf34b90bb4e39b3a2fd22a5531f5ea5a95681015)
+
+https://issues.redhat.com/browse/RHEL-145769 [rhel-10.2]
+https://issues.redhat.com/browse/RHEL-145770 [rhel-9.8]
+---
+ src/qemu/qemu_migration.c | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
+index 755b9a5e1a..2a4df1191d 100644
+--- a/src/qemu/qemu_migration.c
++++ b/src/qemu/qemu_migration.c
+@@ -3183,7 +3183,6 @@ qemuMigrationDstPrepare(virQEMUDriver *driver,
+  * @vm: domain object
+  * @mig: migration cookie
+  * @migParams: migration parameters
+- * @flags: migration flags
+  *
+  * Checks whether block dirty bitmaps offered by the migration source are
+  * to be migrated (e.g. they don't exist, the destination is compatible etc)
+@@ -3194,16 +3193,13 @@ qemuMigrationDstPrepare(virQEMUDriver *driver,
+ static int
+ qemuMigrationDstPrepareAnyBlockDirtyBitmaps(virDomainObj *vm,
+                                             qemuMigrationCookie *mig,
+-                                            qemuMigrationParams *migParams,
+-                                            unsigned int flags)
++                                            qemuMigrationParams *migParams)
+ {
+     g_autoptr(virJSONValue) mapping = NULL;
+     g_autoptr(GHashTable) blockNamedNodeData = NULL;
+     GSList *nextdisk;
+ 
+-    if (!mig->nbd ||
+-        !mig->blockDirtyBitmaps ||
+-        !(flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)))
++    if (!mig->blockDirtyBitmaps)
+         return 0;
+ 
+     if (qemuMigrationCookieBlockDirtyBitmapsMatchDisks(vm->def, mig->blockDirtyBitmaps) < 0)
+@@ -3350,7 +3346,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
+         goto error;
+     }
+ 
+-    if (qemuMigrationDstPrepareAnyBlockDirtyBitmaps(vm, mig, migParams, flags) < 0)
++    if (qemuMigrationDstPrepareAnyBlockDirtyBitmaps(vm, mig, migParams) < 0)
+         goto error;
+ 
+     if (qemuMigrationParamsCheck(vm, VIR_ASYNC_JOB_MIGRATION_IN, migParams,
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemuMigrationDstPrepareAnyBlockDirtyBitmaps-Fix-check-for-existing-bitmaps.patch b/SOURCES/libvirt-qemuMigrationDstPrepareAnyBlockDirtyBitmaps-Fix-check-for-existing-bitmaps.patch
new file mode 100644
index 0000000..3d5a33c
--- /dev/null
+++ b/SOURCES/libvirt-qemuMigrationDstPrepareAnyBlockDirtyBitmaps-Fix-check-for-existing-bitmaps.patch
@@ -0,0 +1,68 @@
+From eb094db2b8112409813105d4dcc313e8ea45ee1e Mon Sep 17 00:00:00 2001
+Message-ID: <eb094db2b8112409813105d4dcc313e8ea45ee1e.1770203323.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 27 Jan 2026 19:22:08 +0100
+Subject: [PATCH] qemuMigrationDstPrepareAnyBlockDirtyBitmaps: Fix check for
+ existing bitmaps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On incoming migration qemu doesn't load bitmaps into memory (which makes
+them available under the 'dirty-bitmaps' field which we parse as the
+'bitmaps' array in 'qemuBlockNamedNodeData') until after actually
+resuming CPUs, thus the check for existing bitmaps never actually
+worked.
+
+We need to check the 'qcow2bitmaps' field instead which is populated
+from the qcow2 headers prior to activating the image.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 0c75fc1747f039bf878ceab69cf12482ebb14095)
+
+https://issues.redhat.com/browse/RHEL-145769 [rhel-10.2]
+https://issues.redhat.com/browse/RHEL-145770 [rhel-9.8]
+---
+ src/qemu/qemu_migration.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
+index 9059f9aa3a..723e131c98 100644
+--- a/src/qemu/qemu_migration.c
++++ b/src/qemu/qemu_migration.c
+@@ -3227,6 +3227,8 @@ qemuMigrationDstPrepareAnyBlockDirtyBitmaps(virDomainObj *vm,
+         qemuBlockNamedNodeData *nodedata;
+         GSList *nextbitmap;
+ 
++        VIR_DEBUG("offer migrate bitmaps for '%s'", disk->target);
++
+         if (!(nodedata = virHashLookup(blockNamedNodeData, disk->nodename))) {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("failed to find data for block node '%1$s'"),
+@@ -3243,18 +3245,14 @@ qemuMigrationDstPrepareAnyBlockDirtyBitmaps(virDomainObj *vm,
+ 
+         for (nextbitmap = disk->bitmaps; nextbitmap; nextbitmap = nextbitmap->next) {
+             qemuMigrationBlockDirtyBitmapsDiskBitmap *bitmap = nextbitmap->data;
+-            size_t k;
+ 
+             /* don't migrate into existing bitmaps */
+-            for (k = 0; k < nodedata->nbitmaps; k++) {
+-                if (STREQ(bitmap->bitmapname, nodedata->bitmaps[k]->name)) {
+-                    bitmap->skip = true;
+-                    break;
+-                }
+-            }
++            if (nodedata->qcow2bitmaps)
++                bitmap->skip = g_strv_contains((const char **) nodedata->qcow2bitmaps, bitmap->bitmapname);
++
++            VIR_DEBUG("offer migrate bitmap '%s' disk '%s' -> skip: '%d'",
++                      bitmap->bitmapname, disk->target, bitmap->skip);
+ 
+-            if (bitmap->skip)
+-                continue;
+         }
+     }
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemuMonitorJSONGetCPUModelExpansion-refactor-parsing-functions.patch b/SOURCES/libvirt-qemuMonitorJSONGetCPUModelExpansion-refactor-parsing-functions.patch
deleted file mode 100644
index b9a5cb0..0000000
--- a/SOURCES/libvirt-qemuMonitorJSONGetCPUModelExpansion-refactor-parsing-functions.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 19e552685d72cf3c8064c56ee9bce5859303da25 Mon Sep 17 00:00:00 2001
-Message-ID: <19e552685d72cf3c8064c56ee9bce5859303da25.1749039441.git.jdenemar@redhat.com>
-From: Collin Walling <walling@linux.ibm.com>
-Date: Mon, 16 Dec 2024 18:03:52 -0500
-Subject: [PATCH] qemuMonitorJSONGetCPUModelExpansion: refactor parsing
- functions
-
-Refactor the CPU Model parsing functions within
-qemuMonitorJSONGetCPUModelExpansion.  The new functions,
-qemuMonitorJSONParseCPUModelExpansionData and
-qemuMonitorJSONParseCPUModelExpansion invoke the functions they
-replace and leave room for a subsequent patch to handle parsing the
-(optional) deprecated_props field resulting from the command.
-
-Signed-off-by: Collin Walling <walling@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 60e407deb5cd88e5f1564d1c9145e374001cf34f)
-JIRA: https://issues.redhat.com/browse/RHEL-89415
-Signed-off-by: Thomas Huth <thuth@redhat.com>
----
- src/qemu/qemu_monitor_json.c | 46 ++++++++++++++++++++++++++++++------
- 1 file changed, 39 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index be5d3be7e6..5df32922fb 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -5125,6 +5125,37 @@ qemuMonitorJSONParseCPUModel(const char *cpu_name,
- }
- 
- 
-+static int
-+qemuMonitorJSONParseCPUModelExpansionData(virJSONValue *data,
-+                                          bool fail_no_props,
-+                                          virJSONValue **cpu_model,
-+                                          virJSONValue **cpu_props,
-+                                          const char **cpu_name)
-+{
-+    if (qemuMonitorJSONParseCPUModelData(data, "query-cpu-model-expansion",
-+                                         fail_no_props, cpu_model, cpu_props,
-+                                         cpu_name) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
-+static int
-+qemuMonitorJSONParseCPUModelExpansion(const char *cpu_name,
-+                                      virJSONValue *cpu_props,
-+                                      qemuMonitorCPUModelInfo **model_info)
-+{
-+    g_autoptr(qemuMonitorCPUModelInfo) expanded_model = NULL;
-+
-+    if (qemuMonitorJSONParseCPUModel(cpu_name, cpu_props, &expanded_model) < 0)
-+        return -1;
-+
-+    *model_info = g_steal_pointer(&expanded_model);
-+    return 0;
-+}
-+
-+
- static int
- qemuMonitorJSONQueryCPUModelExpansionOne(qemuMonitor *mon,
-                                          qemuMonitorCPUModelExpansionType type,
-@@ -5195,9 +5226,9 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon,
-     if ((rc = qemuMonitorJSONQueryCPUModelExpansionOne(mon, type, &model, &data)) <= 0)
-         return rc;
- 
--    if (qemuMonitorJSONParseCPUModelData(data, "query-cpu-model-expansion",
--                                         fail_no_props, &cpu_model, &cpu_props,
--                                         &cpu_name) < 0)
-+    if (qemuMonitorJSONParseCPUModelExpansionData(data, fail_no_props,
-+                                                  &cpu_model, &cpu_props,
-+                                                  &cpu_name) < 0)
-         return -1;
- 
-     /* QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_FULL requests "full" expansion
-@@ -5213,13 +5244,14 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon,
-         if ((rc = qemuMonitorJSONQueryCPUModelExpansionOne(mon, type, &fullModel, &fullData)) <= 0)
-             return rc;
- 
--        if (qemuMonitorJSONParseCPUModelData(fullData, "query-cpu-model-expansion",
--                                             fail_no_props, &cpu_model, &cpu_props,
--                                             &cpu_name) < 0)
-+        if (qemuMonitorJSONParseCPUModelExpansionData(fullData, fail_no_props,
-+                                                      &cpu_model, &cpu_props,
-+                                                      &cpu_name) < 0)
-             return -1;
-     }
- 
--    return qemuMonitorJSONParseCPUModel(cpu_name, cpu_props, model_info);
-+    return qemuMonitorJSONParseCPUModelExpansion(cpu_name, cpu_props,
-+                                                 model_info);
- }
- 
- 
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemuMonitorJSONHandleIOError-Do-not-munge-reason-field-of-IO-error-event.patch b/SOURCES/libvirt-qemuMonitorJSONHandleIOError-Do-not-munge-reason-field-of-IO-error-event.patch
deleted file mode 100644
index 46d64ed..0000000
--- a/SOURCES/libvirt-qemuMonitorJSONHandleIOError-Do-not-munge-reason-field-of-IO-error-event.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 321a694cb6e4c401f9b2ea130ebae046a3f0c88b Mon Sep 17 00:00:00 2001
-Message-ID: <321a694cb6e4c401f9b2ea130ebae046a3f0c88b.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 27 Jan 2025 13:53:36 +0100
-Subject: [PATCH] qemuMonitorJSONHandleIOError: Do not munge 'reason' field of
- IO error event
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Leave the interpretation of the event to 'qemuProcessHandleIOError()'
-which will create it's own variant of the messages for the user-facing
-libvirt events. qemuMonitorJSONHandleIOError() will pass through the raw
-data it got from qemu.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit f8f8d5a253633aaae93b04d92bdcbed5b954149f)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/qemu/qemu_monitor.c      |  3 ++-
- src/qemu/qemu_monitor.h      |  2 ++
- src/qemu/qemu_monitor_json.c | 12 ++++++------
- src/qemu/qemu_process.c      |  9 +++++++--
- 4 files changed, 17 insertions(+), 9 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index e98da5fbff..e0161b8e23 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -1130,12 +1130,13 @@ qemuMonitorEmitIOError(qemuMonitor *mon,
-                        const char *device,
-                        const char *nodename,
-                        int action,
-+                       bool nospace,
-                        const char *reason)
- {
-     VIR_DEBUG("mon=%p", mon);
- 
-     QEMU_MONITOR_CALLBACK(mon, domainIOError, mon->vm,
--                          device, nodename, action, reason);
-+                          device, nodename, action, nospace, reason);
- }
- 
- 
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 0ab60f286d..0655802dcc 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -209,6 +209,7 @@ typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
-                                                  const char *device,
-                                                  const char *nodename,
-                                                  int action,
-+                                                 bool nospace,
-                                                  const char *reason);
- typedef void (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon,
-                                                   virDomainObj *vm,
-@@ -453,6 +454,7 @@ void qemuMonitorEmitIOError(qemuMonitor *mon,
-                             const char *device,
-                             const char *nodename,
-                             int action,
-+                            bool nospace,
-                             const char *reason);
- void qemuMonitorEmitGraphics(qemuMonitor *mon,
-                              int phase,
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 345e9383e3..7d202133f7 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -695,8 +695,8 @@ qemuMonitorJSONHandleIOError(qemuMonitor *mon, virJSONValue *data)
-     const char *device;
-     const char *nodename;
-     const char *action;
--    const char *reason = "";
--    bool nospc = false;
-+    const char *reason;
-+    bool nospace = false;
-     int actionID;
- 
-     /* Throughout here we try our best to carry on upon errors,
-@@ -719,16 +719,16 @@ qemuMonitorJSONHandleIOError(qemuMonitor *mon, virJSONValue *data)
-     }
- 
-     nodename = virJSONValueObjectGetString(data, "node-name");
--
--    if (virJSONValueObjectGetBoolean(data, "nospace", &nospc) == 0 && nospc)
--        reason = "enospc";
-+    reason = virJSONValueObjectGetString(data, "reason");
-+    /* 'nospace' flag is relevant only when true */
-+    ignore_value(virJSONValueObjectGetBoolean(data, "nospace", &nospace));
- 
-     if ((actionID = qemuMonitorIOErrorActionTypeFromString(action)) < 0) {
-         VIR_WARN("unknown disk io error action '%s'", action);
-         actionID = VIR_DOMAIN_EVENT_IO_ERROR_NONE;
-     }
- 
--    qemuMonitorEmitIOError(mon, device, nodename, actionID, reason);
-+    qemuMonitorEmitIOError(mon, device, nodename, actionID, nospace, reason);
- }
- 
- 
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 4083188af4..9ae39c0379 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -827,7 +827,8 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-                          const char *device,
-                          const char *nodename,
-                          int action,
--                         const char *reason)
-+                         bool nospace,
-+                         const char *reason G_GNUC_UNUSED)
- {
-     qemuDomainObjPrivate *priv;
-     virObjectEvent *ioErrorEvent = NULL;
-@@ -835,6 +836,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-     virObjectEvent *lifecycleEvent = NULL;
-     const char *eventPath = "";
-     const char *eventAlias = "";
-+    const char *eventReason = "";
-     virDomainDiskDef *disk;
- 
-     virObjectLock(vm);
-@@ -852,8 +854,11 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-         eventAlias = disk->info.alias;
-     }
- 
-+    if (nospace)
-+        eventReason = "enospc";
-+
-     ioErrorEvent = virDomainEventIOErrorNewFromObj(vm, eventPath, eventAlias, action);
--    ioErrorEvent2 = virDomainEventIOErrorReasonNewFromObj(vm, eventPath, eventAlias, action, reason);
-+    ioErrorEvent2 = virDomainEventIOErrorReasonNewFromObj(vm, eventPath, eventAlias, action, eventReason);
- 
-     if (action == VIR_DOMAIN_EVENT_IO_ERROR_PAUSE &&
-         virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) {
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuMonitorJSONHandleIOError-Propagate-new-qom-path-field.patch b/SOURCES/libvirt-qemuMonitorJSONHandleIOError-Propagate-new-qom-path-field.patch
deleted file mode 100644
index c22337e..0000000
--- a/SOURCES/libvirt-qemuMonitorJSONHandleIOError-Propagate-new-qom-path-field.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From c987c88930aa84b0b96d06bbd84287a7e62cc812 Mon Sep 17 00:00:00 2001
-Message-ID: <c987c88930aa84b0b96d06bbd84287a7e62cc812.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 28 Jan 2025 10:39:52 +0100
-Subject: [PATCH] qemuMonitorJSONHandleIOError: Propagate new 'qom-path' field
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QEMU commit v9.1.0-1065-ge67b7aef7c added 'qom-path' as an optional
-field for the BLOCK_IO_ERROR event. Extract and propagate it as an
-alternative to lookup via 'node-name' and 'device' (alias).
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 0525323175253b1fe1a161181e58bd348d9c605b)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/qemu/qemu_monitor.c      | 3 ++-
- src/qemu/qemu_monitor.h      | 2 ++
- src/qemu/qemu_monitor_json.c | 4 +++-
- src/qemu/qemu_process.c      | 3 ++-
- 4 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index e0161b8e23..79ff4e2e87 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -1128,6 +1128,7 @@ qemuMonitorEmitWatchdog(qemuMonitor *mon, int action)
- void
- qemuMonitorEmitIOError(qemuMonitor *mon,
-                        const char *device,
-+                       const char *qompath,
-                        const char *nodename,
-                        int action,
-                        bool nospace,
-@@ -1136,7 +1137,7 @@ qemuMonitorEmitIOError(qemuMonitor *mon,
-     VIR_DEBUG("mon=%p", mon);
- 
-     QEMU_MONITOR_CALLBACK(mon, domainIOError, mon->vm,
--                          device, nodename, action, nospace, reason);
-+                          device, qompath, nodename, action, nospace, reason);
- }
- 
- 
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 0655802dcc..a4818a6aa1 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -207,6 +207,7 @@ typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon,
- typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
-                                                  virDomainObj *vm,
-                                                  const char *device,
-+                                                 const char *qompath,
-                                                  const char *nodename,
-                                                  int action,
-                                                  bool nospace,
-@@ -452,6 +453,7 @@ void qemuMonitorEmitRTCChange(qemuMonitor *mon, long long offset);
- void qemuMonitorEmitWatchdog(qemuMonitor *mon, int action);
- void qemuMonitorEmitIOError(qemuMonitor *mon,
-                             const char *device,
-+                            const char *qompath,
-                             const char *nodename,
-                             int action,
-                             bool nospace,
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 7d202133f7..53648dea8b 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -693,6 +693,7 @@ static void
- qemuMonitorJSONHandleIOError(qemuMonitor *mon, virJSONValue *data)
- {
-     const char *device;
-+    const char *qompath;
-     const char *nodename;
-     const char *action;
-     const char *reason;
-@@ -718,6 +719,7 @@ qemuMonitorJSONHandleIOError(qemuMonitor *mon, virJSONValue *data)
-             device = NULL;
-     }
- 
-+    qompath = virJSONValueObjectGetString(data, "qom-path");
-     nodename = virJSONValueObjectGetString(data, "node-name");
-     reason = virJSONValueObjectGetString(data, "reason");
-     /* 'nospace' flag is relevant only when true */
-@@ -728,7 +730,7 @@ qemuMonitorJSONHandleIOError(qemuMonitor *mon, virJSONValue *data)
-         actionID = VIR_DOMAIN_EVENT_IO_ERROR_NONE;
-     }
- 
--    qemuMonitorEmitIOError(mon, device, nodename, actionID, nospace, reason);
-+    qemuMonitorEmitIOError(mon, device, qompath, nodename, actionID, nospace, reason);
- }
- 
- 
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index b0a20328d4..c95b1ecd82 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -825,6 +825,7 @@ static void
- qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-                          virDomainObj *vm,
-                          const char *device,
-+                         const char *qompath,
-                          const char *nodename,
-                          int action,
-                          bool nospace,
-@@ -847,7 +848,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-         disk = qemuDomainDiskLookupByNodename(vm->def, priv->backup, nodename, &src);
- 
-     if (!disk)
--        disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, device, NULL);
-+        disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, device, qompath);
- 
-     if (!src && disk)
-         src = disk->src;
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuPrepareNVRAMFile-Fix-NVRAM-image-conversion-check.patch b/SOURCES/libvirt-qemuPrepareNVRAMFile-Fix-NVRAM-image-conversion-check.patch
deleted file mode 100644
index 76d666f..0000000
--- a/SOURCES/libvirt-qemuPrepareNVRAMFile-Fix-NVRAM-image-conversion-check.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6e265f4f5faa468497e9bbdd86701d17480fcd38 Mon Sep 17 00:00:00 2001
-Message-ID: <6e265f4f5faa468497e9bbdd86701d17480fcd38.1750259242.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 28 Feb 2025 14:00:23 +0100
-Subject: [PATCH] qemuPrepareNVRAMFile: Fix NVRAM image conversion check
-
-In case when user provides custom paths (those not covered by the JSON
-firmware descriptor files or  the default locations) for the
-loader and nvram template no auto-detection will be performed and user's
-config will be taken at face value. Historically when 'templateFormat'
-didn't exist we assumed that the 'format' field covers both.
-
-Thus if 'templateFormat' is VIR_STORAGE_FILE_NONE we need to skip the
-check forbidding image format conversion for 'file' backed to avoid
-breaking legacy configs with manual/non-detected format assuming that
-user picked the correct format.
-
-Add a comment to the declaration of 'nvramTemplateFormat' noting the
-above for future reference.
-
-Resolves: https://issues.redhat.com/browse/RHEL-81731
-Fixes: 2aa644a2fc8
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit e088895a6246ac3b7f160e1895f2940c4b13b0cc)
-https://issues.redhat.com/browse/RHEL-97758
----
- src/conf/domain_conf.h  | 7 +++++++
- src/qemu/qemu_process.c | 5 ++++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 961b7b056c..20be6f7c05 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -2361,6 +2361,13 @@ struct _virDomainLoaderDef {
-     virStorageSource *nvram;
-     bool newStyleNVRAM;
-     char *nvramTemplate;   /* user override of path to master nvram */
-+    /* Historically it was assumed that the format of the template and the
-+     * actual nvram image are identical, which is no longer true.
-+     *
-+     * Note: if 'nvramTemplate' comes from the user and is not overriden by
-+     * auto-detection nvramTemplateFormat may be VIR_STORAGE_FILE_NONE. Code
-+     * shall assume that the template format matches if it isn't provided.
-+     */
-     virStorageFileFormat nvramTemplateFormat;
- };
- 
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 64683ecfe0..a78aa8569d 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -4727,7 +4727,10 @@ qemuPrepareNVRAMFile(virQEMUDriver *driver,
-         return -1;
-     }
- 
--    if (loader->nvram->format != loader->nvramTemplateFormat) {
-+    /* If 'nvramTemplateFormat' is empty it means that it's a user-provided
-+     * template which we couldn't verify. Assume the user knows what they're doing */
-+    if (loader->nvramTemplateFormat != VIR_STORAGE_FILE_NONE &&
-+        loader->nvram->format != loader->nvramTemplateFormat) {
-         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                        _("conversion of the nvram template to another target format is not supported"));
-         return -1;
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemuProcessHandleIOError-Log-IO-errors-in-the-VM-log-file.patch b/SOURCES/libvirt-qemuProcessHandleIOError-Log-IO-errors-in-the-VM-log-file.patch
deleted file mode 100644
index 7589b2a..0000000
--- a/SOURCES/libvirt-qemuProcessHandleIOError-Log-IO-errors-in-the-VM-log-file.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0ad096e3448a2b6e366995220f4266af34dd9010 Mon Sep 17 00:00:00 2001
-Message-ID: <0ad096e3448a2b6e366995220f4266af34dd9010.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 24 Jan 2025 17:01:34 +0100
-Subject: [PATCH] qemuProcessHandleIOError: Log IO errors in the VM log file
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add a log entry to the VM log file for every time we receive an IO error
-event from qemu. The log entry is as follows:
-
- 2025-01-24 16:03:28.928+0000: IO error device='virtio-disk0' node-name='libvirt-1-storage' reason='other: Input/output error'
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 18f8d572be4caaa0c55a8d68a4048ef2360a03c5)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/qemu/qemu_process.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 6b8a2af4ed..409734d948 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -829,7 +829,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-                          const char *nodename,
-                          int action,
-                          bool nospace,
--                         const char *reason G_GNUC_UNUSED)
-+                         const char *reason)
- {
-     qemuDomainObjPrivate *priv;
-     virObjectEvent *ioErrorEvent = NULL;
-@@ -867,6 +867,9 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-     ioErrorEvent2 = virDomainEventIOErrorReasonNewFromObj(vm, eventPath, eventAlias, action, eventReason);
- 
-     if ((timestamp = virTimeStringNow()) != NULL) {
-+        qemuDomainLogAppendMessage(priv->driver, vm, "%s: IO error device='%s' node-name='%s' reason='%s'\n",
-+                                   timestamp, NULLSTR(eventAlias), NULLSTR(nodename), NULLSTR(reason));
-+
-         if (src) {
-             g_free(src->ioerror_timestamp);
-             g_free(src->ioerror_message);
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuProcessHandleIOError-Populate-I-O-error-reason-to-virStorageSource.patch b/SOURCES/libvirt-qemuProcessHandleIOError-Populate-I-O-error-reason-to-virStorageSource.patch
deleted file mode 100644
index d7374cb..0000000
--- a/SOURCES/libvirt-qemuProcessHandleIOError-Populate-I-O-error-reason-to-virStorageSource.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d67189b0a37a76b60bab7d9e1f527bf4d984be16 Mon Sep 17 00:00:00 2001
-Message-ID: <d67189b0a37a76b60bab7d9e1f527bf4d984be16.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 27 Jan 2025 19:17:16 +0100
-Subject: [PATCH] qemuProcessHandleIOError: Populate I/O error reason to
- virStorageSource
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Record the last I/O error reason and timestamp which happened with the
-corresponding virStorageSource struct.
-
-This will later allow querying the last error e.g. via the
-virDomainGetMessages() API.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 300f7e9bd4ee4e043cac1a84059fe4a60b101cf1)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/qemu/qemu_process.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index c95b1ecd82..6b8a2af4ed 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -840,6 +840,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-     const char *eventReason = "";
-     virDomainDiskDef *disk = NULL;
-     virStorageSource *src = NULL;
-+    g_autofree char *timestamp = NULL;
- 
-     virObjectLock(vm);
-     priv = QEMU_DOMAIN_PRIVATE(vm);
-@@ -865,6 +866,15 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-     ioErrorEvent = virDomainEventIOErrorNewFromObj(vm, eventPath, eventAlias, action);
-     ioErrorEvent2 = virDomainEventIOErrorReasonNewFromObj(vm, eventPath, eventAlias, action, eventReason);
- 
-+    if ((timestamp = virTimeStringNow()) != NULL) {
-+        if (src) {
-+            g_free(src->ioerror_timestamp);
-+            g_free(src->ioerror_message);
-+            src->ioerror_timestamp = g_steal_pointer(&timestamp);
-+            src->ioerror_message = g_strdup(reason);
-+        }
-+    }
-+
-     if (action == VIR_DOMAIN_EVENT_IO_ERROR_PAUSE &&
-         virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) {
-         VIR_WARN("Transitioned guest %s to paused state due to IO error", vm->def->name);
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuProcessHandleIOError-Prefer-lookup-by-node-name.patch b/SOURCES/libvirt-qemuProcessHandleIOError-Prefer-lookup-by-node-name.patch
deleted file mode 100644
index fd830d8..0000000
--- a/SOURCES/libvirt-qemuProcessHandleIOError-Prefer-lookup-by-node-name.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 56a472de55c45c97fd5f201073327c2d7c6d43c3 Mon Sep 17 00:00:00 2001
-Message-ID: <56a472de55c45c97fd5f201073327c2d7c6d43c3.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 24 Jan 2025 17:17:51 +0100
-Subject: [PATCH] qemuProcessHandleIOError: Prefer lookup by node name
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When qemu reports a node name for an I/O error we should prefer the
-lookup by node name instead as it gives us the path to the specific
-image which caused the error instead of the top level image path.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 784538a470fe346cb1ab85786b8ece85cbe7ff9f)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/qemu/qemu_process.c | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 9ae39c0379..b0a20328d4 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -837,22 +837,26 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-     const char *eventPath = "";
-     const char *eventAlias = "";
-     const char *eventReason = "";
--    virDomainDiskDef *disk;
-+    virDomainDiskDef *disk = NULL;
-+    virStorageSource *src = NULL;
- 
-     virObjectLock(vm);
-     priv = QEMU_DOMAIN_PRIVATE(vm);
- 
--    if (device)
-+    if (nodename)
-+        disk = qemuDomainDiskLookupByNodename(vm->def, priv->backup, nodename, &src);
-+
-+    if (!disk)
-         disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, device, NULL);
--    else if (nodename)
--        disk = qemuDomainDiskLookupByNodename(vm->def, NULL, nodename, NULL);
--    else
--        disk = NULL;
- 
--    if (disk) {
--        eventPath = virDomainDiskGetSource(disk);
-+    if (!src && disk)
-+        src = disk->src;
-+
-+    if (disk)
-         eventAlias = disk->info.alias;
--    }
-+
-+    if (src && src->path)
-+        eventPath = src->path;
- 
-     if (nospace)
-         eventReason = "enospc";
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuProcessHandleIOError-Refactor-to-extract-priv-instead-of-driver.patch b/SOURCES/libvirt-qemuProcessHandleIOError-Refactor-to-extract-priv-instead-of-driver.patch
deleted file mode 100644
index df2dad8..0000000
--- a/SOURCES/libvirt-qemuProcessHandleIOError-Refactor-to-extract-priv-instead-of-driver.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 8ae4a9c8e3f66dd7a94cfa4f12614c7ba3e3b1c3 Mon Sep 17 00:00:00 2001
-Message-ID: <8ae4a9c8e3f66dd7a94cfa4f12614c7ba3e3b1c3.1738940190.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 24 Jan 2025 17:16:35 +0100
-Subject: [PATCH] qemuProcessHandleIOError: Refactor to extract 'priv' instead
- of 'driver'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The VM private data will be used in a sub-sequent patch. To minimize
-churn, refactor the function before changing the logic.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 72142dcde34dd7e1dfb3ea0d841f567badd80539)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/qemu/qemu_process.c | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 7297263d33..c618fbf69c 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -829,7 +829,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-                          int action,
-                          const char *reason)
- {
--    virQEMUDriver *driver;
-+    qemuDomainObjPrivate *priv;
-     virObjectEvent *ioErrorEvent = NULL;
-     virObjectEvent *ioErrorEvent2 = NULL;
-     virObjectEvent *lifecycleEvent = NULL;
-@@ -838,7 +838,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-     virDomainDiskDef *disk;
- 
-     virObjectLock(vm);
--    driver = QEMU_DOMAIN_PRIVATE(vm)->driver;
-+    priv = QEMU_DOMAIN_PRIVATE(vm);
- 
-     if (*diskAlias == '\0')
-         diskAlias = NULL;
-@@ -863,7 +863,6 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
- 
-     if (action == VIR_DOMAIN_EVENT_IO_ERROR_PAUSE &&
-         virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) {
--        qemuDomainObjPrivate *priv = vm->privateData;
-         VIR_WARN("Transitioned guest %s to paused state due to IO error", vm->def->name);
- 
-         if (priv->signalIOError)
-@@ -875,7 +874,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-                                                   VIR_DOMAIN_EVENT_SUSPENDED_IOERROR);
- 
-         VIR_FREE(priv->lockState);
--        if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0)
-+        if (virDomainLockProcessPause(priv->driver->lockManager, vm, &priv->lockState) < 0)
-             VIR_WARN("Unable to release lease on %s", vm->def->name);
-         VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState));
- 
-@@ -883,9 +882,9 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-     }
-     virObjectUnlock(vm);
- 
--    virObjectEventStateQueue(driver->domainEventState, ioErrorEvent);
--    virObjectEventStateQueue(driver->domainEventState, ioErrorEvent2);
--    virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
-+    virObjectEventStateQueue(priv->driver->domainEventState, ioErrorEvent);
-+    virObjectEventStateQueue(priv->driver->domainEventState, ioErrorEvent2);
-+    virObjectEventStateQueue(priv->driver->domainEventState, lifecycleEvent);
- }
- 
- 
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuProcessHandleIOError-Rename-local-variables.patch b/SOURCES/libvirt-qemuProcessHandleIOError-Rename-local-variables.patch
deleted file mode 100644
index 645f8ec..0000000
--- a/SOURCES/libvirt-qemuProcessHandleIOError-Rename-local-variables.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8a4acd4ce68b416a9de21b3ad7ca976cfc3b01ee Mon Sep 17 00:00:00 2001
-Message-ID: <8a4acd4ce68b416a9de21b3ad7ca976cfc3b01ee.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 27 Jan 2025 13:07:24 +0100
-Subject: [PATCH] qemuProcessHandleIOError: Rename local variables
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Prefix the helper variables used to supply data to the event by
-'event'. Declare them with the default value of an empty string rather
-than doing it later.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 590a5765c190230ab3df87e7eda42f621766347b)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/qemu/qemu_process.c | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 3861d91228..4083188af4 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -833,8 +833,8 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-     virObjectEvent *ioErrorEvent = NULL;
-     virObjectEvent *ioErrorEvent2 = NULL;
-     virObjectEvent *lifecycleEvent = NULL;
--    const char *srcPath;
--    const char *devAlias;
-+    const char *eventPath = "";
-+    const char *eventAlias = "";
-     virDomainDiskDef *disk;
- 
-     virObjectLock(vm);
-@@ -848,15 +848,12 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
-         disk = NULL;
- 
-     if (disk) {
--        srcPath = virDomainDiskGetSource(disk);
--        devAlias = disk->info.alias;
--    } else {
--        srcPath = "";
--        devAlias = "";
-+        eventPath = virDomainDiskGetSource(disk);
-+        eventAlias = disk->info.alias;
-     }
- 
--    ioErrorEvent = virDomainEventIOErrorNewFromObj(vm, srcPath, devAlias, action);
--    ioErrorEvent2 = virDomainEventIOErrorReasonNewFromObj(vm, srcPath, devAlias, action, reason);
-+    ioErrorEvent = virDomainEventIOErrorNewFromObj(vm, eventPath, eventAlias, action);
-+    ioErrorEvent2 = virDomainEventIOErrorReasonNewFromObj(vm, eventPath, eventAlias, action, reason);
- 
-     if (action == VIR_DOMAIN_EVENT_IO_ERROR_PAUSE &&
-         virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) {
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuSecurityMoveImageMetadata-Move-seclabels-only-to-virStorageSource-of-same-type.patch b/SOURCES/libvirt-qemuSecurityMoveImageMetadata-Move-seclabels-only-to-virStorageSource-of-same-type.patch
new file mode 100644
index 0000000..ddc8a2c
--- /dev/null
+++ b/SOURCES/libvirt-qemuSecurityMoveImageMetadata-Move-seclabels-only-to-virStorageSource-of-same-type.patch
@@ -0,0 +1,57 @@
+From 887c6befa9ee57f0da96f49dd62bea463bbc75af Mon Sep 17 00:00:00 2001
+Message-ID: <887c6befa9ee57f0da96f49dd62bea463bbc75af.1769699807.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 12 Jan 2026 10:54:38 +0100
+Subject: [PATCH] qemuSecurityMoveImageMetadata: Move seclabels only to
+ virStorageSource of same type
+
+The concept of moving a seclabel is used e.g. when a new image is
+introduced to the backing chain (or one of the existing ones becomes
+active during block commit). What it does is that it moves the metedata
+remembering the original seclabel to the new image.
+
+That idea works reasonably well if both the original and new image are
+of same type e.g. a file, where they have comparable seclabel.
+
+It breaks down though when you e.g. create a snapshot stored in a 'file'
+on top of a disk originally backed by a 'block' storage source, since
+the seclabels differ quite siginificantly.
+
+This patch restricts the seclabel move in qemuSecurityMoveImageMetadata
+to happen only if the storage sources are of same type to avoid the
+issue. This means that the seclabels will not be remebered and will be
+restored to the default but it's better than to transfer wrong labels.
+
+Resolves: https://issues.redhat.com/browse/RHEL-114412
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 37d51c0d27692a245d7a5eeeef57748e7574de4b)
+https://issues.redhat.com/browse/RHEL-140624
+---
+ src/qemu/qemu_security.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c
+index 6bb0f9170d..84cb981a96 100644
+--- a/src/qemu/qemu_security.c
++++ b/src/qemu/qemu_security.c
+@@ -201,6 +201,16 @@ qemuSecurityMoveImageMetadata(virQEMUDriver *driver,
+     if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
+         pid = vm->pid;
+ 
++    /* Moving seclabel metadata makes sense only when 'src' and 'dst' are of
++     * the same type. Otherwise 'dst' could end up with a seclabel that doesn't
++     * make sense for it (e.g. a seclabel originating from a block device /dev
++     * node moved to a file), once the seclabels are restored for it */
++    if (src && dst && src->type != dst->type) {
++        VIR_DEBUG("dropping security label metadata instead of moving it from '%s' to '%s' due to type mismatch",
++                  NULLSTR(src->path), NULLSTR(dst->path));
++        dst = NULL;
++    }
++
+     return virSecurityManagerMoveImageMetadata(driver->securityManager,
+                                                cfg->sharedFilesystems,
+                                                pid, src, dst);
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemuSnapshotDiskHasBackingDisk-Avoid-call-of-virStorageSourceIsSameLocation-with-NULL-argument.patch b/SOURCES/libvirt-qemuSnapshotDiskHasBackingDisk-Avoid-call-of-virStorageSourceIsSameLocation-with-NULL-argument.patch
new file mode 100644
index 0000000..62d2a7a
--- /dev/null
+++ b/SOURCES/libvirt-qemuSnapshotDiskHasBackingDisk-Avoid-call-of-virStorageSourceIsSameLocation-with-NULL-argument.patch
@@ -0,0 +1,48 @@
+From 5192ca6507c19b3c98df8dff4354d2e22d946cfb Mon Sep 17 00:00:00 2001
+Message-ID: <5192ca6507c19b3c98df8dff4354d2e22d946cfb.1769699807.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 23 Jan 2026 08:42:50 +0100
+Subject: [PATCH] qemuSnapshotDiskHasBackingDisk: Avoid call of
+ virStorageSourceIsSameLocation with NULL argument
+
+When the 'backingStore' pointer is not populated the function calls
+'virStorageSourceGetMetadata' to try to populate it but if the on-disk
+metadata doesn't have a backing image (e.g. if it's the 'base' image of
+the chain) the 'backingStore' or the metadata fetcher fails the pointer
+will still be NULL.
+
+The function then calls 'virStorageSourceIsSameLocation' but the
+internal functions for dealing with storage sources don't handle NULL
+gracefully.
+
+Since the code calling 'qemu-img' based on the data detected here
+doesn't actually raise errors if the operations fail there's no point
+in raising errors here either.
+
+Closes: https://gitlab.com/libvirt/libvirt/-/issues/844
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit b43aee9cc904961e0f18156c3c84a3e460bdb7be)
+
+ https://issues.redhat.com/browse/RHEL-144089 [rhel-10.2]
+ https://issues.redhat.com/browse/RHEL-144090 [rhel-9.8]
+---
+ src/qemu/qemu_snapshot.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
+index 302775af92..dfc3f449e3 100644
+--- a/src/qemu/qemu_snapshot.c
++++ b/src/qemu/qemu_snapshot.c
+@@ -3135,7 +3135,8 @@ qemuSnapshotDiskHasBackingDisk(void *payload,
+         if (!disk->src->backingStore)
+             ignore_value(virStorageSourceGetMetadata(disk->src, uid, gid, 1, false));
+ 
+-        if (virStorageSourceIsSameLocation(disk->src->backingStore, iterdata->diskSrc)) {
++        if (disk->src->backingStore &&
++            virStorageSourceIsSameLocation(disk->src->backingStore, iterdata->diskSrc)) {
+             struct _qemuSnapshotDisksWithBackingStoreData *data =
+                 g_new0(struct _qemuSnapshotDisksWithBackingStoreData, 1);
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemuSnapshotDiskHasBackingDisk-Use-proper-max_depth-when-calling-virStorageSourceGetMetadata.patch b/SOURCES/libvirt-qemuSnapshotDiskHasBackingDisk-Use-proper-max_depth-when-calling-virStorageSourceGetMetadata.patch
new file mode 100644
index 0000000..f81c7a0
--- /dev/null
+++ b/SOURCES/libvirt-qemuSnapshotDiskHasBackingDisk-Use-proper-max_depth-when-calling-virStorageSourceGetMetadata.patch
@@ -0,0 +1,75 @@
+From f14123947915d38c9c1b9664f5da73cbf21ff4c5 Mon Sep 17 00:00:00 2001
+Message-ID: <f14123947915d38c9c1b9664f5da73cbf21ff4c5.1769699807.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 26 Jan 2026 16:39:24 +0100
+Subject: [PATCH] qemuSnapshotDiskHasBackingDisk: Use proper 'max_depth' when
+ calling 'virStorageSourceGetMetadata'
+
+The 'max_depth' argument of 'virStorageSourceGetMetadata' doesn't just
+limit how far the function goes but also fails completely if the chain
+is deeper than the passed value.
+
+In 'qemuSnapshotDiskHasBackingDisk' we only care about finding the
+backing image, so just one level below, the passed path, but due to the
+above setting '1' as max_depth will make the function simply fail every
+time.
+
+Extract and reuse QEMU_DOMAIN_STORAGE_SOURCE_CHAIN_MAX_DEPTH as the
+detection depth. While '200' layers is overkill for this code, we also
+start a full qemu instance just to delete an snapshot so this doens't
+matter and still protects from self-referential images.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 6bcdf4ee59595041c76ed2339c45503723400737)
+
+ https://issues.redhat.com/browse/RHEL-144089 [rhel-10.2]
+ https://issues.redhat.com/browse/RHEL-144090 [rhel-9.8]
+---
+ src/qemu/qemu_domain.c   | 2 --
+ src/qemu/qemu_domain.h   | 1 +
+ src/qemu/qemu_snapshot.c | 4 +++-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index ac56fc7cb4..486a0e7913 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -6297,8 +6297,6 @@ qemuDomainStorageAlias(const char *device, int depth)
+ }
+ 
+ 
+-#define QEMU_DOMAIN_STORAGE_SOURCE_CHAIN_MAX_DEPTH 200
+-
+ /**
+  * qemuDomainStorageSourceValidateDepth:
+  * @src: storage source chain to validate
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index 3396f929fd..b9bb338682 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -706,6 +706,7 @@ int qemuDomainCheckDiskStartupPolicy(virQEMUDriver *driver,
+                                      size_t diskIndex,
+                                      bool cold_boot);
+ 
++#define QEMU_DOMAIN_STORAGE_SOURCE_CHAIN_MAX_DEPTH 200
+ int qemuDomainStorageSourceValidateDepth(virStorageSource *src,
+                                          int add,
+                                          const char *diskdst);
+diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
+index 942ba0d437..c23add5103 100644
+--- a/src/qemu/qemu_snapshot.c
++++ b/src/qemu/qemu_snapshot.c
+@@ -3133,7 +3133,9 @@ qemuSnapshotDiskHasBackingDisk(void *payload,
+                               NULL, &uid, &gid);
+ 
+         if (!disk->src->backingStore)
+-            ignore_value(virStorageSourceGetMetadata(disk->src, uid, gid, 1, false));
++            ignore_value(virStorageSourceGetMetadata(disk->src, uid, gid,
++                                                     QEMU_DOMAIN_STORAGE_SOURCE_CHAIN_MAX_DEPTH,
++                                                     false));
+ 
+         if (disk->src->backingStore &&
+             virStorageSourceIsSameLocation(disk->src->backingStore, iterdata->diskSrc)) {
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemuSnapshotForEachQcow2-Don-t-initialize-nrollback.patch b/SOURCES/libvirt-qemuSnapshotForEachQcow2-Don-t-initialize-nrollback.patch
deleted file mode 100644
index 6fc3601..0000000
--- a/SOURCES/libvirt-qemuSnapshotForEachQcow2-Don-t-initialize-nrollback.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b6efc51ef60d5aa4ee94a85ad7211ab51034407e Mon Sep 17 00:00:00 2001
-Message-ID: <b6efc51ef60d5aa4ee94a85ad7211ab51034407e.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 3 Feb 2025 18:23:29 +0100
-Subject: [PATCH] qemuSnapshotForEachQcow2: Don't initialize 'nrollback'
-
-The variable holds the amount of disks to roll back the snapshot for.
-The value must be set before the code jumps to the 'rollback:' label so
-the best situation is to not initialize it and let the compiler catch
-errors rather than initialize the unsigned variable to -1 and let it
-crash.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit d15eff63041ace067fa0ea9687c482a0f1dd140f)
-
-https://issues.redhat.com/browse/RHEL-73315
----
- src/qemu/qemu_snapshot.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
-index 80cd54bf33..7c998afe6f 100644
---- a/src/qemu/qemu_snapshot.c
-+++ b/src/qemu/qemu_snapshot.c
-@@ -290,7 +290,7 @@ qemuSnapshotForEachQcow2(virDomainDef *def,
-     size_t i;
-     bool skipped = false;
-     bool create = STREQ(op, "-c");
--    size_t nrollback = -1;
-+    size_t nrollback;
-     virErrorPtr orig_err;
- 
-     /* pre-checks */
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuSnapshotUpdateBackingStore-Remove-stale-comment.patch b/SOURCES/libvirt-qemuSnapshotUpdateBackingStore-Remove-stale-comment.patch
new file mode 100644
index 0000000..c159416
--- /dev/null
+++ b/SOURCES/libvirt-qemuSnapshotUpdateBackingStore-Remove-stale-comment.patch
@@ -0,0 +1,34 @@
+From beaa6db9d526a2fe044507483d709505e1d62bb5 Mon Sep 17 00:00:00 2001
+Message-ID: <beaa6db9d526a2fe044507483d709505e1d62bb5.1769699807.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 23 Jan 2026 08:54:32 +0100
+Subject: [PATCH] qemuSnapshotUpdateBackingStore: Remove stale comment
+
+The code does a 'qemu-img rebase' rather than a 'qemu-img create' what
+the commit suggests. Since we enumerate all arguments right below,
+there's no need for a comment.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 452c281aee7a043b59a288de043ea4e3b75a6b7c)
+
+ https://issues.redhat.com/browse/RHEL-144089 [rhel-10.2]
+ https://issues.redhat.com/browse/RHEL-144090 [rhel-9.8]
+---
+ src/qemu/qemu_snapshot.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
+index dfc3f449e3..942ba0d437 100644
+--- a/src/qemu/qemu_snapshot.c
++++ b/src/qemu/qemu_snapshot.c
+@@ -3698,7 +3698,6 @@ qemuSnapshotUpdateBackingStore(qemuSnapshotDeleteExternalData *data)
+         struct _qemuSnapshotDisksWithBackingStoreData *backingData = cur->data;
+         g_autoptr(virCommand) cmd = NULL;
+ 
+-        /* creates cmd line args: qemu-img create -f qcow2 -o */
+         if (!(cmd = virCommandNewArgList("qemu-img",
+                                          "rebase",
+                                          "-u",
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemuSnapshotUpdateBackingStore-Retry-as-curent-user-if-qemu-img-fails.patch b/SOURCES/libvirt-qemuSnapshotUpdateBackingStore-Retry-as-curent-user-if-qemu-img-fails.patch
new file mode 100644
index 0000000..8d5f560
--- /dev/null
+++ b/SOURCES/libvirt-qemuSnapshotUpdateBackingStore-Retry-as-curent-user-if-qemu-img-fails.patch
@@ -0,0 +1,97 @@
+From d5878727f9fab5a93f040d1c8c340bb1d5e9da40 Mon Sep 17 00:00:00 2001
+Message-ID: <d5878727f9fab5a93f040d1c8c340bb1d5e9da40.1769699807.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 26 Jan 2026 16:49:50 +0100
+Subject: [PATCH] qemuSnapshotUpdateBackingStore: Retry as curent user if
+ qemu-img fails
+
+The code calls 'qemu-img rebase' to fix the backing store references.
+The 'qemu-img' process here is run as the 'qemu' user or whatever the
+defaults and domain XML resolve to. Since this, in certain cases, works
+also on images which are not part of the backing chain and in privileged
+deployments thus can be owned by 'root:root' the update may fail
+(silently).
+
+To preserver root-squash deployments but fix also the above case, retry
+the operation on failure as current user.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 6bb982178b40768f37c5177f317e73562733530f)
+
+ https://issues.redhat.com/browse/RHEL-144089 [rhel-10.2]
+ https://issues.redhat.com/browse/RHEL-144090 [rhel-9.8]
+---
+ src/qemu/qemu_snapshot.c | 53 ++++++++++++++++++++++++++++------------
+ 1 file changed, 38 insertions(+), 15 deletions(-)
+
+diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
+index c23add5103..e30ade9dc8 100644
+--- a/src/qemu/qemu_snapshot.c
++++ b/src/qemu/qemu_snapshot.c
+@@ -3698,25 +3698,48 @@ qemuSnapshotUpdateBackingStore(qemuSnapshotDeleteExternalData *data)
+ 
+     for (cur = data->disksWithBacking; cur; cur = g_slist_next(cur)) {
+         struct _qemuSnapshotDisksWithBackingStoreData *backingData = cur->data;
+-        g_autoptr(virCommand) cmd = NULL;
++        /* Try to run the command first as the appropriate user based on the
++         * domain definition and config. If error is returned retry as current
++         * (possibly privileged) user for cases where seclabels were reset
++         * to the default */
++        g_autoptr(virCommand) cmd_user_qemu = NULL;
++        g_autoptr(virCommand) cmd_user_curr = NULL;
+ 
+-        if (!(cmd = virCommandNewArgList("qemu-img",
+-                                         "rebase",
+-                                         "-u",
+-                                         "-F",
+-                                         virStorageFileFormatTypeToString(data->parentDiskSrc->format),
+-                                         "-f",
+-                                         virStorageFileFormatTypeToString(backingData->diskSrc->format),
+-                                         "-b",
+-                                         data->parentDiskSrc->path,
+-                                         backingData->diskSrc->path,
+-                                         NULL)))
++        if (!(cmd_user_qemu = virCommandNewArgList("qemu-img",
++                                                   "rebase",
++                                                   "-u",
++                                                   "-F",
++                                                   virStorageFileFormatTypeToString(data->parentDiskSrc->format),
++                                                   "-f",
++                                                   virStorageFileFormatTypeToString(backingData->diskSrc->format),
++                                                   "-b",
++                                                   data->parentDiskSrc->path,
++                                                   backingData->diskSrc->path,
++                                                   NULL)))
+             continue;
+ 
+-        virCommandSetUID(cmd, backingData->uid);
+-        virCommandSetGID(cmd, backingData->gid);
++        virCommandSetUID(cmd_user_qemu, backingData->uid);
++        virCommandSetGID(cmd_user_qemu, backingData->gid);
+ 
+-        ignore_value(virCommandRun(cmd, NULL));
++        /* done on success */
++        if (virCommandRun(cmd_user_qemu, NULL) == 0)
++            continue;
++
++        /* retry as current user */
++        if (!(cmd_user_curr = virCommandNewArgList("qemu-img",
++                                                   "rebase",
++                                                   "-u",
++                                                   "-F",
++                                                   virStorageFileFormatTypeToString(data->parentDiskSrc->format),
++                                                   "-f",
++                                                   virStorageFileFormatTypeToString(backingData->diskSrc->format),
++                                                   "-b",
++                                                   data->parentDiskSrc->path,
++                                                   backingData->diskSrc->path,
++                                                   NULL)))
++            continue;
++
++        ignore_value(virCommandRun(cmd_user_curr, NULL));
+     }
+ }
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemuValidateDomainDeviceDefNetwork-Require-shared-memory-for-all-vhost-user-interfaces.patch b/SOURCES/libvirt-qemuValidateDomainDeviceDefNetwork-Require-shared-memory-for-all-vhost-user-interfaces.patch
deleted file mode 100644
index d79ec57..0000000
--- a/SOURCES/libvirt-qemuValidateDomainDeviceDefNetwork-Require-shared-memory-for-all-vhost-user-interfaces.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 5337b43f308c025977311d700b2bd89dfc848b0c Mon Sep 17 00:00:00 2001
-Message-ID: <5337b43f308c025977311d700b2bd89dfc848b0c.1742990721.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 11 Mar 2025 09:01:12 +0100
-Subject: [PATCH] qemuValidateDomainDeviceDefNetwork: Require shared memory for
- all vhost-user interfaces
-
-Currently we produce only a warning into the log if a non-passt
-vhost-user interface is configured with shared memory.
-
-Since we do make it fatal with all other vhost-user types, fix the check
-to trigger also for normal-vhost-user interfaces.
-
-Since passt-based vhost-user interfaces are checked separately the check
-will no longer be required.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 0d20632179e1a61903f30986215bef53b0f912f6)
-
-https://issues.redhat.com/browse/RHEL-84133
----
- src/qemu/qemu_validate.c                                 | 9 +++------
- .../net-vhostuser-passt-no-shmem.x86_64-latest.err       | 2 +-
- 2 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index f814ee8c0d..1c61038f93 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -1828,12 +1828,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-         return -1;
-     }
- 
--    if (net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER &&
--        net->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) {
--        if (qemuValidateDomainDefVhostUserRequireSharedMemory(def, "interface type=\"vhostuser\" backend type=\"passt\"") < 0)
--            return -1;
--    }
--
-     if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
-         if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_VHOST_VDPA)) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-@@ -1857,6 +1851,9 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
-                            _("'reconnect' attribute is not supported when source mode='server' for <interface type='vhostuser'>"));
-             return -1;
-         }
-+
-+        if (qemuValidateDomainDefVhostUserRequireSharedMemory(def, "interface") < 0)
-+            return -1;
-     }
- 
-     if (!virDomainNetIsVirtioModel(net)) {
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.x86_64-latest.err b/tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.x86_64-latest.err
-index 274af5c722..babde17518 100644
---- a/tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.x86_64-latest.err
-+++ b/tests/qemuxmlconfdata/net-vhostuser-passt-no-shmem.x86_64-latest.err
-@@ -1 +1 @@
--unsupported configuration: 'interface type="vhostuser" backend type="passt"' requires shared memory
-+unsupported configuration: 'interface' requires shared memory
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu_agent-Add-qemuAgentGetLoadAvg.patch b/SOURCES/libvirt-qemu_agent-Add-qemuAgentGetLoadAvg.patch
deleted file mode 100644
index 8ae5cc2..0000000
--- a/SOURCES/libvirt-qemu_agent-Add-qemuAgentGetLoadAvg.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 8c10ceadcb2c32217b90277ee73f1eb990c67cbc Mon Sep 17 00:00:00 2001
-Message-ID: <8c10ceadcb2c32217b90277ee73f1eb990c67cbc.1747908717.git.jdenemar@redhat.com>
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Tue, 25 Feb 2025 15:23:07 +0100
-Subject: [PATCH] qemu_agent: Add qemuAgentGetLoadAvg()
-
-With qemu guest agent 9.3 we are able to get the load averages with a
-new command.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 1669d91eade46b930ebb44e4b9d398ea8c2064e7)
-
-https://issues.redhat.com/browse/RHEL-88447
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
----
- src/qemu/qemu_agent.c | 46 +++++++++++++++++++++++++++++++++++++
- src/qemu/qemu_agent.h |  6 +++++
- tests/qemuagenttest.c | 53 +++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 105 insertions(+)
-
-diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
-index 43fca86f10..16a6eaa998 100644
---- a/src/qemu/qemu_agent.c
-+++ b/src/qemu/qemu_agent.c
-@@ -2568,3 +2568,49 @@ int qemuAgentGetDisks(qemuAgent *agent,
-     g_free(*disks);
-     return -1;
- }
-+
-+
-+int
-+qemuAgentGetLoadAvg(qemuAgent *agent,
-+                    double *load1m,
-+                    double *load5m,
-+                    double *load15m,
-+                    bool report_unsupported)
-+{
-+    g_autoptr(virJSONValue) cmd = NULL;
-+    g_autoptr(virJSONValue) reply = NULL;
-+    virJSONValue *data = NULL;
-+    int rc;
-+
-+    if (!(cmd = qemuAgentMakeCommand("guest-get-load", NULL)))
-+        return -1;
-+
-+    if ((rc = qemuAgentCommandFull(agent, cmd, &reply, agent->timeout,
-+                                   report_unsupported)) < 0)
-+        return rc;
-+
-+    if (!(data = virJSONValueObjectGetObject(reply, "return"))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("qemu agent didn't return an array of loads"));
-+        return -1;
-+    }
-+
-+#define GET_NUMBER_PARAM(param_) \
-+    do { \
-+        if (param_ && \
-+            virJSONValueObjectGetNumberDouble(data, #param_, param_) < 0) { \
-+            virReportError(VIR_ERR_INTERNAL_ERROR, \
-+                           _("parameter '%1$s' is missing in reply of guest-get-load"), \
-+                           #param_); \
-+            return -1; \
-+        } \
-+    } while (0)
-+
-+    GET_NUMBER_PARAM(load1m);
-+    GET_NUMBER_PARAM(load5m);
-+    GET_NUMBER_PARAM(load15m);
-+
-+#undef GET_NUMBER_PARAM
-+
-+    return 0;
-+}
-diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h
-index f98586e8f8..cd17a98d39 100644
---- a/src/qemu/qemu_agent.h
-+++ b/src/qemu/qemu_agent.h
-@@ -195,3 +195,9 @@ int qemuAgentSSHRemoveAuthorizedKeys(qemuAgent *agent,
- int qemuAgentGetDisks(qemuAgent *mon,
-                       qemuAgentDiskInfo ***disks,
-                       bool report_unsupported);
-+
-+int qemuAgentGetLoadAvg(qemuAgent *agent,
-+                        double *load1m,
-+                        double *load5m,
-+                        double *load15m,
-+                        bool report_unsupported);
-diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c
-index 3287880241..566571cf11 100644
---- a/tests/qemuagenttest.c
-+++ b/tests/qemuagenttest.c
-@@ -1356,6 +1356,58 @@ testQemuAgentTimezone(const void *data)
-     virTypedParamsFree(params, nparams);
-     return ret;
- }
-+
-+
-+static const char testQemuAgentGetLoadAvgResponse[] =
-+    "{"
-+    "  \"return\": {"
-+    "    \"load15m\": 0.03564453125,"
-+    "    \"load5m\": 0.064453125,"
-+    "    \"load1m\": 0.00390625"
-+    "  }"
-+    "}";
-+
-+static int
-+testQemuAgentGetLoadAvg(const void *data)
-+{
-+    virDomainXMLOption *xmlopt = (virDomainXMLOption *)data;
-+    g_autoptr(qemuMonitorTest) test = qemuMonitorTestNewAgent(xmlopt);
-+    double load1m = 0;
-+    double load5m = 0;
-+    double load15m = 0;
-+
-+    if (!test)
-+        return -1;
-+
-+    if (qemuMonitorTestAddAgentSyncResponse(test) < 0)
-+        return -1;
-+
-+    if (qemuMonitorTestAddItem(test, "guest-get-load",
-+                               testQemuAgentGetLoadAvgResponse) < 0)
-+        return -1;
-+
-+    if (qemuAgentGetLoadAvg(qemuMonitorTestGetAgent(test),
-+                            &load1m, &load5m, &load15m, true) < 0)
-+        return -1;
-+
-+#define VALIDATE_LOAD(value_, expected_) \
-+    do { \
-+        if (value_ != expected_) { \
-+            virReportError(VIR_ERR_INTERNAL_ERROR, \
-+                           "Expected " #value_ " '%.11f', got '%.11f'", \
-+                           expected_, value_); \
-+            return -1; \
-+        } \
-+    } while (0)
-+
-+    VALIDATE_LOAD(load1m, 0.00390625);
-+    VALIDATE_LOAD(load5m, 0.064453125);
-+    VALIDATE_LOAD(load15m, 0.03564453125);
-+
-+    return 0;
-+}
-+
-+
- static int
- mymain(void)
- {
-@@ -1392,6 +1444,7 @@ mymain(void)
-     DO_TEST(Timezone);
-     DO_TEST(SSHKeys);
-     DO_TEST(GetDisks);
-+    DO_TEST(GetLoadAvg);
- 
-     DO_TEST(Timeout); /* Timeout should always be called last */
- 
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu_capabilities-Fetch-caps-for-virtio-mem-ccw-too.patch b/SOURCES/libvirt-qemu_capabilities-Fetch-caps-for-virtio-mem-ccw-too.patch
deleted file mode 100644
index 5cc1402..0000000
--- a/SOURCES/libvirt-qemu_capabilities-Fetch-caps-for-virtio-mem-ccw-too.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-From 6d104057ac63fed07c493e2a73694503ac0ef0f1 Mon Sep 17 00:00:00 2001
-Message-ID: <6d104057ac63fed07c493e2a73694503ac0ef0f1.1747908717.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 7 May 2025 14:32:52 +0200
-Subject: [PATCH] qemu_capabilities: Fetch caps for virtio-mem-ccw too
-
-While with upstream QEMU it's impossible to have virtio-mem-ccw and not
-have virtio-mem-pci, in RHEL the QEMU's build system is patched to make
-that possible. But this breaks our assumption when fetching
-capabilities.
-
-Well, just do what we are already doing in this situation (e.g.
-"virtio-blk-pci"/"virtio-blk-ccw" & virQEMUCapsDevicePropsVirtioBlk, or
-"virtio-scsi-pci"/"virtio-net-ccw" & virQEMUCapsDevicePropsVirtioSCSI):
-fetch the same set of props for both devices.
-
-Resolves: https://issues.redhat.com/browse/RHEL-87532
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 6ff8d08777ebbcb9a1e11534c3a3341fbf0343e8)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-
-Conflicts:
-tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies: Context,
-becuase v11.3.0-28-g670aae6cda is not backported.
----
- src/qemu/qemu_capabilities.c                  |   4 +
- .../caps_10.0.0_s390x.replies                 | 202 +++++++++++++++---
- 2 files changed, 182 insertions(+), 24 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 1a9cf72482..b507027667 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -1546,6 +1546,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVhostUserFS[] =
-     { "bootindex", QEMU_CAPS_VHOST_USER_FS_BOOTINDEX, NULL },
- };
- 
-+/* This is used also for QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW */
- static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioMemPCI[] = {
-     { "prealloc", QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_PREALLOC, NULL },
-     { "dynamic-memslots", QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_DYNAMIC_MEMSLOTS, NULL },
-@@ -1714,6 +1715,9 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = {
-     { "virtio-mem-pci", virQEMUCapsDevicePropsVirtioMemPCI,
-       G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioMemPCI),
-       QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI },
-+    { "virtio-mem-ccw", virQEMUCapsDevicePropsVirtioMemPCI,
-+      G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioMemPCI),
-+      QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW },
-     { "virtio-iommu-pci", virQEMUCapsDevicePropsVirtioIOMMU,
-       G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioIOMMU),
-       QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI },
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
-index 05b13b2d2b..18f098153d 100644
---- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
-@@ -29500,11 +29500,165 @@
- {
-   "execute": "device-list-properties",
-   "arguments": {
--    "typename": "virtio-iommu-pci"
-+    "typename": "virtio-mem-ccw"
-   },
-   "id": "libvirt-30"
- }
- 
-+{
-+  "return": [
-+    {
-+      "name": "dev_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "devno",
-+      "description": "Identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "subch_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "max_revision",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "memaddr",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "memdev",
-+      "type": "link<memory-backend>"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-early-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "node",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "requested-size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "block-size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "prealloc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "dynamic-memslots",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-mem>"
-+    }
-+  ],
-+  "id": "libvirt-30"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-iommu-pci"
-+  },
-+  "id": "libvirt-31"
-+}
-+
- {
-   "return": [
-     {
-@@ -29774,7 +29928,7 @@
-       "type": "child<virtio-iommu-device>"
-     }
-   ],
--  "id": "libvirt-30"
-+  "id": "libvirt-31"
- }
- 
- {
-@@ -29782,7 +29936,7 @@
-   "arguments": {
-     "typename": "virtio-blk-ccw"
-   },
--  "id": "libvirt-31"
-+  "id": "libvirt-32"
- }
- 
- {
-@@ -30065,7 +30219,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-31"
-+  "id": "libvirt-32"
- }
- 
- {
-@@ -30073,7 +30227,7 @@
-   "arguments": {
-     "typename": "memory-backend-file"
-   },
--  "id": "libvirt-32"
-+  "id": "libvirt-33"
- }
- 
- {
-@@ -30163,7 +30317,7 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-32"
-+  "id": "libvirt-33"
- }
- 
- {
-@@ -30171,7 +30325,7 @@
-   "arguments": {
-     "typename": "memory-backend-memfd"
-   },
--  "id": "libvirt-33"
-+  "id": "libvirt-34"
- }
- 
- {
-@@ -30250,12 +30404,12 @@
-       "type": "int"
-     }
-   ],
--  "id": "libvirt-33"
-+  "id": "libvirt-34"
- }
- 
- {
-   "execute": "query-machines",
--  "id": "libvirt-34"
-+  "id": "libvirt-35"
- }
- 
- {
-@@ -30530,7 +30684,7 @@
-       "default-ram-id": "s390.ram"
-     }
-   ],
--  "id": "libvirt-34"
-+  "id": "libvirt-35"
- }
- 
- {
-@@ -30538,7 +30692,7 @@
-   "arguments": {
-     "typename": "none-machine"
-   },
--  "id": "libvirt-35"
-+  "id": "libvirt-36"
- }
- 
- {
-@@ -30653,12 +30807,12 @@
-       "type": "bool"
-     }
-   ],
--  "id": "libvirt-35"
-+  "id": "libvirt-36"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-@@ -31368,32 +31522,32 @@
-       "deprecated": false
-     }
-   ],
--  "id": "libvirt-36"
-+  "id": "libvirt-37"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-   "return": [],
--  "id": "libvirt-37"
-+  "id": "libvirt-38"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "return": [],
--  "id": "libvirt-38"
-+  "id": "libvirt-39"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-@@ -32646,12 +32800,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-39"
-+  "id": "libvirt-40"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -32745,7 +32899,7 @@
-       "capability": "mapped-ram"
-     }
-   ],
--  "id": "libvirt-40"
-+  "id": "libvirt-41"
- }
- 
- {
-@@ -32756,7 +32910,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
-@@ -32828,7 +32982,7 @@
-       }
-     }
-   },
--  "id": "libvirt-41"
-+  "id": "libvirt-42"
- }
- 
- {
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu_capabilities-filter-deprecated-features-if-requested.patch b/SOURCES/libvirt-qemu_capabilities-filter-deprecated-features-if-requested.patch
deleted file mode 100644
index e0fbcf2..0000000
--- a/SOURCES/libvirt-qemu_capabilities-filter-deprecated-features-if-requested.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 637590711a1e9aaf304e8a6c8ec57adcb0272cca Mon Sep 17 00:00:00 2001
-Message-ID: <637590711a1e9aaf304e8a6c8ec57adcb0272cca.1749039441.git.jdenemar@redhat.com>
-From: Collin Walling <walling@linux.ibm.com>
-Date: Mon, 16 Dec 2024 18:03:56 -0500
-Subject: [PATCH] qemu_capabilities: filter deprecated features if requested
-
-If flag VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES
-is passed to qemuConnectGetDomainCapabilities, then the domain's CPU
-model features will be updated to set any deprecated features to the
-'disabled' policy.
-
-Signed-off-by: Collin Walling <walling@linux.ibm.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit cd1e837c22182dcadfe17b469c931f9fc9745a46)
-JIRA: https://issues.redhat.com/browse/RHEL-89415
-Signed-off-by: Thomas Huth <thuth@redhat.com>
----
- src/qemu/qemu_capabilities.c | 20 ++++++++++++++++++++
- src/qemu/qemu_capabilities.h |  3 +++
- src/qemu/qemu_driver.c       |  8 +++++++-
- 3 files changed, 30 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index b17c582b5e..6bff55f58e 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -3340,6 +3340,26 @@ virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps,
- }
- 
- 
-+void
-+virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *qemuCaps,
-+                                       virDomainVirtType virtType,
-+                                       virCPUDef *cpu)
-+{
-+    qemuMonitorCPUModelInfo *modelInfo;
-+    size_t i;
-+
-+    modelInfo = virQEMUCapsGetCPUModelInfo(qemuCaps, virtType);
-+
-+    if (!modelInfo || !modelInfo->deprecated_props)
-+        return;
-+
-+    for (i = 0; i < g_strv_length(modelInfo->deprecated_props); i++) {
-+        virCPUDefUpdateFeature(cpu, modelInfo->deprecated_props[i],
-+                               VIR_CPU_FEATURE_DISABLE);
-+    }
-+}
-+
-+
- struct tpmTypeToCaps {
-     int type;
-     virQEMUCapsFlags caps;
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index d2bccc0e2a..8de392bf0f 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -768,6 +768,9 @@ int virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps,
-                               virDomainVirtType virtType,
-                               bool migratable,
-                               char ***features);
-+void virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *qemuCaps,
-+                                            virDomainVirtType virtType,
-+                                            virCPUDef *cpu);
- 
- virDomainVirtType virQEMUCapsGetVirtType(virQEMUCaps *qemuCaps);
- 
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index b374b1978c..13e2838f19 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -16544,7 +16544,8 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn,
-     virDomainVirtType virttype;
-     g_autoptr(virDomainCaps) domCaps = NULL;
- 
--    virCheckFlags(0, NULL);
-+    virCheckFlags(VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES,
-+                  NULL);
- 
-     if (virConnectGetDomainCapabilitiesEnsureACL(conn) < 0)
-         return NULL;
-@@ -16563,6 +16564,11 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn,
-                                                        arch, virttype)))
-         return NULL;
- 
-+    if (flags & VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES) {
-+        virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, virttype,
-+                                               domCaps->cpu.hostModel);
-+    }
-+
-     return virDomainCapsFormat(domCaps);
- }
- 
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu_capabilities-query-deprecated-features-for-host-model.patch b/SOURCES/libvirt-qemu_capabilities-query-deprecated-features-for-host-model.patch
deleted file mode 100644
index 98f34dd..0000000
--- a/SOURCES/libvirt-qemu_capabilities-query-deprecated-features-for-host-model.patch
+++ /dev/null
@@ -1,933 +0,0 @@
-From 3620d993bb09b10d6e6e9e44a4a5fdf13a6d3da5 Mon Sep 17 00:00:00 2001
-Message-ID: <3620d993bb09b10d6e6e9e44a4a5fdf13a6d3da5.1749039441.git.jdenemar@redhat.com>
-From: Collin Walling <walling@linux.ibm.com>
-Date: Mon, 16 Dec 2024 18:03:54 -0500
-Subject: [PATCH] qemu_capabilities: query deprecated features for host-model
-
-Add QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRECATED_PROPS for detecting
-if query-cpu-model-expansion can report deprecated CPU model properties.
-QEMU introduced this capability in 9.1 release.  Add flag and deprecated
-features to the capabilities test data for QEMU 9.1 and 9.2 replies/XML
-since it can now be accounted for.
-
-When probing for the host CPU, perform a full CPU model expansion to
-retrieve the list of features deprecated across the entire architecture.
-The list and count are stored in the host's CPU model info within the
-QEMU capabilities.  Other info resulting from this query (e.g. model
-name, etc) is ignored.
-
-The new capabilities flag is used to fence off the extra query for
-architectures/QEMU binaries that do not report deprecated CPU model
-features.
-
-Signed-off-by: Collin Walling <walling@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 51c098347d7f2af9b4386ac0adc4431997d06f3d)
-
-JIRA: https://issues.redhat.com/browse/RHEL-89415
-Conflicts:
-    src/qemu/qemu_capabilities.*
-    (contextual conflict due to different amount of caps in downstream)
-Signed-off-by: Thomas Huth <thuth@redhat.com>
----
- src/qemu/qemu_capabilities.c                  |  40 +-
- src/qemu/qemu_capabilities.h                  |   3 +-
- .../caps_9.1.0_s390x.replies                  | 348 +++++++++++++++++-
- .../qemucapabilitiesdata/caps_9.1.0_s390x.xml |   7 +
- .../caps_9.2.0_s390x.replies                  | 348 +++++++++++++++++-
- .../qemucapabilitiesdata/caps_9.2.0_s390x.xml |   7 +
- 6 files changed, 747 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index b1faea3ac7..b17c582b5e 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -721,10 +721,11 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               "chardev-reconnect-miliseconds", /* QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS */
-               "virtio-ccw.loadparm", /* QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM */
-               "netdev-stream-reconnect-miliseconds", /* QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS */
--              "blockdev-set-active", /* QEMU_CAPS_BLOCKDEV_SET_ACTIVE */
-+              "query-cpu-model-expansion.deprecated-props", /* QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRECATED_PROPS */
- 
-               /* 470 */
-               "virtio-mem-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW */
-+              "blockdev-set-active", /* QEMU_CAPS_BLOCKDEV_SET_ACTIVE */
-     );
- 
- 
-@@ -1601,6 +1602,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
-     { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE },
-     { "screendump/arg-type/format/^png", QEMU_CAPS_SCREENSHOT_FORMAT_PNG },
-     { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT },
-+    { "query-cpu-model-expansion/ret-type/deprecated-props", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRECATED_PROPS },
- };
- 
- typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
-@@ -3160,6 +3162,38 @@ virQEMUCapsProbeHypervCapabilities(virQEMUCaps *qemuCaps,
- }
- 
- 
-+/**
-+ * virQEMUCapsProbeFullDeprecatedProperties
-+ * @mon: QEMU monitor
-+ * @cpu: CPU definition to be expanded
-+ * @props: the array to be filled with deprecated features
-+ *
-+ * Performs a full CPU model expansion to retrieve an array of deprecated
-+ * properties. If the expansion succeeds, then data previously stored in
-+ * @props is freed.
-+ *
-+ * Returns: -1 if the expansion failed; otherwise 0.
-+ */
-+static int
-+virQEMUCapsProbeFullDeprecatedProperties(qemuMonitor *mon,
-+                                         virCPUDef *cpu,
-+                                         GStrv *props)
-+{
-+    g_autoptr(qemuMonitorCPUModelInfo) propsInfo = NULL;
-+
-+    if (qemuMonitorGetCPUModelExpansion(mon, QEMU_MONITOR_CPU_MODEL_EXPANSION_FULL,
-+                                        cpu, true, false, false, &propsInfo) < 0)
-+        return -1;
-+
-+    if (propsInfo && propsInfo->deprecated_props) {
-+        g_free(*props);
-+        *props = g_steal_pointer(&propsInfo->deprecated_props);
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps,
-                            virQEMUCapsAccel *accel,
-@@ -3241,6 +3275,10 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps,
-         modelInfo->migratability = true;
-     }
- 
-+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRECATED_PROPS) &&
-+        virQEMUCapsProbeFullDeprecatedProperties(mon, cpu, &modelInfo->deprecated_props) < 0)
-+        return -1;
-+
-     if (virQEMUCapsTypeIsAccelerated(virtType) &&
-         (ARCH_IS_X86(qemuCaps->arch) || ARCH_IS_ARM(qemuCaps->arch))) {
-         g_autoptr(qemuMonitorCPUModelInfo) fullQEMU = NULL;
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 6467a09796..d2bccc0e2a 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -700,10 +700,11 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS, /* 'reconnect-ms' option for chardevs supported */
-     QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM, /* loadparm available on CCW device for multi device boot */
-     QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS, /* 'reconnect-ms' option for netdev stream supported */
--    QEMU_CAPS_BLOCKDEV_SET_ACTIVE, /* blockdev-set-active QMP command supported */
-+    QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRECATED_PROPS, /* query-cpu-model-expansion may report deprecated CPU properties */
- 
-     /* 470 */
-     QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW, /* -device virtio-mem-ccw */
-+    QEMU_CAPS_BLOCKDEV_SET_ACTIVE, /* blockdev-set-active QMP command supported */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies
-index 2d4ab8ed75..0a523ba47e 100644
---- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies
-+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies
-@@ -32252,6 +32252,89 @@
-   "id": "libvirt-40"
- }
- 
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "host"
-+    }
-+  },
-+  "id": "libvirt-41"
-+}
-+
-+{
-+  "return": {
-+    "deprecated-props": [
-+      "bpb",
-+      "te",
-+      "cte",
-+      "csske"
-+    ],
-+    "model": {
-+      "name": "gen16a-base",
-+      "props": {
-+        "nnpa": true,
-+        "aen": true,
-+        "cmmnt": true,
-+        "vxpdeh": true,
-+        "aefsi": true,
-+        "diag318": true,
-+        "csske": true,
-+        "mepoch": true,
-+        "msa9": true,
-+        "msa8": true,
-+        "msa7": true,
-+        "msa6": true,
-+        "msa5": true,
-+        "msa4": true,
-+        "msa3": true,
-+        "msa2": true,
-+        "msa1": true,
-+        "sthyi": true,
-+        "edat": true,
-+        "ri": true,
-+        "deflate": true,
-+        "edat2": true,
-+        "etoken": true,
-+        "vx": true,
-+        "ipter": true,
-+        "pai": true,
-+        "paie": true,
-+        "mepochptff": true,
-+        "ap": true,
-+        "vxeh": true,
-+        "vxpd": true,
-+        "esop": true,
-+        "msa9_pckmo": true,
-+        "vxeh2": true,
-+        "esort": true,
-+        "appv": true,
-+        "apqi": true,
-+        "apft": true,
-+        "els": true,
-+        "iep": true,
-+        "appvi": true,
-+        "apqci": true,
-+        "cte": true,
-+        "ais": true,
-+        "bpb": true,
-+        "ctop": true,
-+        "gs": true,
-+        "ppa15": true,
-+        "zpci": true,
-+        "rdp": true,
-+        "sea_esop2": true,
-+        "beareh": true,
-+        "te": true,
-+        "cmm": true,
-+        "vxpdeh2": true
-+      }
-+    }
-+  },
-+  "id": "libvirt-41"
-+}
-+
- {
-   "execute": "qmp_capabilities",
-   "id": "libvirt-1"
-@@ -36262,10 +36345,271 @@
- }
- 
- {
--  "execute": "query-machines",
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "max"
-+    }
-+  },
-   "id": "libvirt-4"
- }
- 
-+{
-+  "return": {
-+    "deprecated-props": [
-+      "bpb",
-+      "te",
-+      "cte",
-+      "csske"
-+    ],
-+    "model": {
-+      "name": "gen15a-base",
-+      "props": {
-+        "pfmfi": false,
-+        "exrl": true,
-+        "stfle45": true,
-+        "kmctr-etdea-192": false,
-+        "kmctr-etdea-128": false,
-+        "nnpa": false,
-+        "cmma": false,
-+        "dateh2": false,
-+        "gen13ptff": false,
-+        "aen": true,
-+        "kmo-etdea-192": false,
-+        "kmf-etdea-192": false,
-+        "kmc-etdea-192": false,
-+        "kmac-tdea-192": false,
-+        "kimd-sha-512": true,
-+        "dateh": true,
-+        "km-aes-256": false,
-+        "km-aes-192": false,
-+        "kmctr-aes-256": false,
-+        "kma-gcm-eaes-192": false,
-+        "kmo-tdea-192": false,
-+        "kmf-tdea-192": false,
-+        "kmctr-tdea-192": false,
-+        "kmctr-tdea-128": false,
-+        "km-etdea-192": false,
-+        "kmc-tdea-192": false,
-+        "cmmnt": false,
-+        "iacc2": true,
-+        "parseh": false,
-+        "klmd-sha-512": true,
-+        "kma-gcm-eaes-128": false,
-+        "csst": true,
-+        "pcc-xts-aes-256": false,
-+        "pcc-xts-aes-128": false,
-+        "pckmo-aes-128": false,
-+        "idter": false,
-+        "idtes": true,
-+        "prno-trng-qrtcr": false,
-+        "pcc-cmac-eaes-128": false,
-+        "vxpdeh": false,
-+        "aefsi": true,
-+        "pckmo-etdea-192": false,
-+        "pckmo-etdea-128": false,
-+        "diag318": false,
-+        "pcc-cmac-eaes-256": false,
-+        "msa-base": true,
-+        "pcc-cmac-etdea-192": false,
-+        "hpma2": false,
-+        "kmctr-eaes-256": false,
-+        "csske": false,
-+        "csst2": true,
-+        "mepoch": false,
-+        "msa9": false,
-+        "msa6": false,
-+        "msa1": false,
-+        "kmctr-aes-192": false,
-+        "pckmo-aes-256": false,
-+        "sthyi": false,
-+        "stckf": true,
-+        "stfle": true,
-+        "edat": false,
-+        "etf3": true,
-+        "etf2": true,
-+        "hfpm": false,
-+        "ri": false,
-+        "pcc-xts-eaes-256": false,
-+        "deflate": false,
-+        "km-xts-eaes-256": false,
-+        "km-xts-eaes-128": false,
-+        "edat2": false,
-+        "hfpue": false,
-+        "kmo-aes-192": false,
-+        "kmf-aes-192": false,
-+        "km-eaes-192": false,
-+        "kmc-aes-192": false,
-+        "unpack": false,
-+        "dfp": false,
-+        "kmo-aes-128": false,
-+        "kmf-aes-128": false,
-+        "km-eaes-128": false,
-+        "kmctr-dea": false,
-+        "mvcos": true,
-+        "etoken": false,
-+        "pcc-cmac-tdea-192": false,
-+        "km-dea": false,
-+        "sprogp": true,
-+        "sigpif": false,
-+        "kmac-eaes-128": false,
-+        "ldisphp": true,
-+        "pckmo-aes-192": false,
-+        "ipter": false,
-+        "vx": true,
-+        "pai": false,
-+        "kimd-ghash": false,
-+        "emon": false,
-+        "kimd-sha-1": false,
-+        "cei": false,
-+        "cmpsceh": false,
-+        "kmctr-eaes-192": false,
-+        "kmctr-eaes-128": false,
-+        "ginste": true,
-+        "km-xts-aes-256": false,
-+        "kmac-eaes-256": false,
-+        "kmo-eaes-128": false,
-+        "kmf-eaes-128": false,
-+        "kmc-eaes-128": false,
-+        "kmac-aes-128": false,
-+        "paie": false,
-+        "dfppc": false,
-+        "dfpzc": false,
-+        "dfphp": false,
-+        "kmo-eaes-256": false,
-+        "kmf-eaes-256": false,
-+        "kmc-eaes-256": false,
-+        "kmac-aes-256": false,
-+        "kmac-etdea-192": false,
-+        "kmac-etdea-128": false,
-+        "kmo-dea": false,
-+        "kmf-dea": false,
-+        "km-edea": false,
-+        "kmc-dea": false,
-+        "stfle49": true,
-+        "klmd-sha-1": false,
-+        "mepochptff": false,
-+        "opc": false,
-+        "ap": false,
-+        "asnlxr": false,
-+        "gpereh": false,
-+        "minste2": true,
-+        "pcc-cmac-dea": false,
-+        "vxpd": false,
-+        "vxeh": true,
-+        "esop": true,
-+        "ectg": true,
-+        "ib": false,
-+        "km-tdea-192": false,
-+        "km-tdea-128": false,
-+        "msa9_pckmo": false,
-+        "siif": false,
-+        "kma-gcm-aes-256": false,
-+        "kma-gcm-aes-192": false,
-+        "kma-gcm-aes-128": false,
-+        "pcc-cmac-aes-256": false,
-+        "tsi": false,
-+        "vxeh2": true,
-+        "tpei": false,
-+        "esort": false,
-+        "esan3": true,
-+        "fpe": true,
-+        "ibs": false,
-+        "pcc-xts-eaes-128": false,
-+        "kmac-eaes-192": false,
-+        "zarch": true,
-+        "kmo-edea": false,
-+        "kmf-edea": false,
-+        "kmc-edea": false,
-+        "kmac-dea": false,
-+        "appv": false,
-+        "apqi": false,
-+        "apft": false,
-+        "stfle53": true,
-+        "ppno-sha-512-drng": false,
-+        "pcc-cmac-tdea-128": false,
-+        "kmo-aes-256": false,
-+        "kmf-aes-256": false,
-+        "km-eaes-256": false,
-+        "kmc-aes-256": false,
-+        "els": false,
-+        "sief2": false,
-+        "eimm": true,
-+        "pcc-cmac-etdea-128": false,
-+        "iep": true,
-+        "irbm": false,
-+        "km-xts-aes-128": false,
-+        "srs": true,
-+        "appvi": false,
-+        "apqci": false,
-+        "kmo-tdea-128": false,
-+        "kmf-tdea-128": false,
-+        "km-etdea-128": false,
-+        "kmc-tdea-128": false,
-+        "kss": false,
-+        "cte": false,
-+        "kmac-edea": false,
-+        "prno-trng": true,
-+        "kma-gcm-eaes-256": false,
-+        "ais": true,
-+        "fpseh": true,
-+        "ltlbc": true,
-+        "ldisp": true,
-+        "kmo-etdea-128": false,
-+        "kmf-etdea-128": false,
-+        "kmc-etdea-128": false,
-+        "kmac-tdea-128": false,
-+        "pcc-cmac-edea": false,
-+        "bpb": false,
-+        "kmctr-edea": false,
-+        "64bscao": false,
-+        "ctop": false,
-+        "kmo-eaes-192": false,
-+        "kmf-eaes-192": false,
-+        "kmc-eaes-192": false,
-+        "kmac-aes-192": false,
-+        "gs": false,
-+        "sema": false,
-+        "etf3eh": true,
-+        "etf2eh": true,
-+        "eec": false,
-+        "pcc-cmac-eaes-192": false,
-+        "ppa15": false,
-+        "kmc-prng": false,
-+        "zpci": true,
-+        "rdp": false,
-+        "nonqks": false,
-+        "sea_esop2": true,
-+        "minste3": true,
-+        "beareh": false,
-+        "pfpo": false,
-+        "te": false,
-+        "msa8-base": true,
-+        "msa4-base": true,
-+        "msa3-base": true,
-+        "msa5-base": true,
-+        "pcc-cmac-aes-192": false,
-+        "cmm": false,
-+        "tods": false,
-+        "pcc-cmac-aes-128": false,
-+        "plo": true,
-+        "pckmo-edea": false,
-+        "gsls": false,
-+        "kmctr-aes-128": false,
-+        "skey": false,
-+        "vxpdeh2": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-5"
-+}
-+
- {
-   "return": [
-     {
-@@ -36568,5 +36912,5 @@
-       "default-ram-id": "s390.ram"
-     }
-   ],
--  "id": "libvirt-4"
-+  "id": "libvirt-5"
- }
-diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
-index 5e8db88e52..b3265dcc18 100644
---- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
-@@ -133,6 +133,7 @@
-   <flag name='virtio-sound'/>
-   <flag name='netdev.user'/>
-   <flag name='snapshot-internal-qmp'/>
-+  <flag name='query-cpu-model-expansion.deprecated-props'/>
-   <version>9001000</version>
-   <microcodeVersion>39100246</microcodeVersion>
-   <package>v9.1.0</package>
-@@ -356,6 +357,12 @@
-     <property name='msa3-base' type='boolean' value='true'/>
-     <property name='msa5-base' type='boolean' value='true'/>
-     <property name='tods' type='boolean' value='false'/>
-+    <deprecatedFeatures>
-+      <property name='bpb'/>
-+      <property name='te'/>
-+      <property name='cte'/>
-+      <property name='csske'/>
-+    </deprecatedFeatures>
-   </hostCPU>
-   <cpu type='tcg' name='z13' typename='z13-s390x-cpu' usable='no'>
-     <blocker name='ppno-sha-512-drng'/>
-diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies
-index 91c9a049bf..9a58acaf08 100644
---- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies
-+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies
-@@ -32411,6 +32411,89 @@
-   "id": "libvirt-40"
- }
- 
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "host"
-+    }
-+  },
-+  "id": "libvirt-41"
-+}
-+
-+{
-+  "return": {
-+    "deprecated-props": [
-+      "bpb",
-+      "te",
-+      "cte",
-+      "csske"
-+    ],
-+    "model": {
-+      "name": "gen16a-base",
-+      "props": {
-+        "nnpa": true,
-+        "aen": true,
-+        "cmmnt": true,
-+        "vxpdeh": true,
-+        "aefsi": true,
-+        "diag318": true,
-+        "csske": true,
-+        "mepoch": true,
-+        "msa9": true,
-+        "msa8": true,
-+        "msa7": true,
-+        "msa6": true,
-+        "msa5": true,
-+        "msa4": true,
-+        "msa3": true,
-+        "msa2": true,
-+        "msa1": true,
-+        "sthyi": true,
-+        "edat": true,
-+        "ri": true,
-+        "deflate": true,
-+        "edat2": true,
-+        "etoken": true,
-+        "vx": true,
-+        "ipter": true,
-+        "pai": true,
-+        "paie": true,
-+        "mepochptff": true,
-+        "ap": true,
-+        "vxeh": true,
-+        "vxpd": true,
-+        "esop": true,
-+        "msa9_pckmo": true,
-+        "vxeh2": true,
-+        "esort": true,
-+        "appv": true,
-+        "apqi": true,
-+        "apft": true,
-+        "els": true,
-+        "iep": true,
-+        "appvi": true,
-+        "apqci": true,
-+        "cte": true,
-+        "ais": true,
-+        "bpb": true,
-+        "ctop": true,
-+        "gs": true,
-+        "ppa15": true,
-+        "zpci": true,
-+        "rdp": true,
-+        "sea_esop2": true,
-+        "beareh": true,
-+        "te": true,
-+        "cmm": true,
-+        "vxpdeh2": true
-+      }
-+    }
-+  },
-+  "id": "libvirt-41"
-+}
-+
- {
-   "execute": "qmp_capabilities",
-   "id": "libvirt-1"
-@@ -36421,10 +36504,271 @@
- }
- 
- {
--  "execute": "query-machines",
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "max"
-+    }
-+  },
-   "id": "libvirt-4"
- }
- 
-+{
-+  "return": {
-+    "deprecated-props": [
-+      "bpb",
-+      "te",
-+      "cte",
-+      "csske"
-+    ],
-+    "model": {
-+      "name": "gen15a-base",
-+      "props": {
-+        "pfmfi": false,
-+        "exrl": true,
-+        "stfle45": true,
-+        "kmctr-etdea-192": false,
-+        "kmctr-etdea-128": false,
-+        "nnpa": false,
-+        "cmma": false,
-+        "dateh2": false,
-+        "gen13ptff": false,
-+        "aen": true,
-+        "kmo-etdea-192": false,
-+        "kmf-etdea-192": false,
-+        "kmc-etdea-192": false,
-+        "kmac-tdea-192": false,
-+        "kimd-sha-512": true,
-+        "dateh": true,
-+        "km-aes-256": false,
-+        "km-aes-192": false,
-+        "kmctr-aes-256": false,
-+        "kma-gcm-eaes-192": false,
-+        "kmo-tdea-192": false,
-+        "kmf-tdea-192": false,
-+        "kmctr-tdea-192": false,
-+        "kmctr-tdea-128": false,
-+        "km-etdea-192": false,
-+        "kmc-tdea-192": false,
-+        "cmmnt": false,
-+        "iacc2": true,
-+        "parseh": false,
-+        "klmd-sha-512": true,
-+        "kma-gcm-eaes-128": false,
-+        "csst": true,
-+        "pcc-xts-aes-256": false,
-+        "pcc-xts-aes-128": false,
-+        "pckmo-aes-128": false,
-+        "idter": false,
-+        "idtes": true,
-+        "prno-trng-qrtcr": false,
-+        "pcc-cmac-eaes-128": false,
-+        "vxpdeh": false,
-+        "aefsi": true,
-+        "pckmo-etdea-192": false,
-+        "pckmo-etdea-128": false,
-+        "diag318": false,
-+        "pcc-cmac-eaes-256": false,
-+        "msa-base": true,
-+        "pcc-cmac-etdea-192": false,
-+        "hpma2": false,
-+        "kmctr-eaes-256": false,
-+        "csske": false,
-+        "csst2": true,
-+        "mepoch": false,
-+        "msa9": false,
-+        "msa6": false,
-+        "msa1": false,
-+        "kmctr-aes-192": false,
-+        "pckmo-aes-256": false,
-+        "sthyi": false,
-+        "stckf": true,
-+        "stfle": true,
-+        "edat": false,
-+        "etf3": true,
-+        "etf2": true,
-+        "hfpm": false,
-+        "ri": false,
-+        "pcc-xts-eaes-256": false,
-+        "deflate": false,
-+        "km-xts-eaes-256": false,
-+        "km-xts-eaes-128": false,
-+        "edat2": false,
-+        "hfpue": false,
-+        "kmo-aes-192": false,
-+        "kmf-aes-192": false,
-+        "km-eaes-192": false,
-+        "kmc-aes-192": false,
-+        "unpack": false,
-+        "dfp": false,
-+        "kmo-aes-128": false,
-+        "kmf-aes-128": false,
-+        "km-eaes-128": false,
-+        "kmctr-dea": false,
-+        "mvcos": true,
-+        "etoken": false,
-+        "pcc-cmac-tdea-192": false,
-+        "km-dea": false,
-+        "sprogp": true,
-+        "sigpif": false,
-+        "kmac-eaes-128": false,
-+        "ldisphp": true,
-+        "pckmo-aes-192": false,
-+        "ipter": false,
-+        "vx": true,
-+        "pai": false,
-+        "kimd-ghash": false,
-+        "emon": false,
-+        "kimd-sha-1": false,
-+        "cei": false,
-+        "cmpsceh": false,
-+        "kmctr-eaes-192": false,
-+        "kmctr-eaes-128": false,
-+        "ginste": true,
-+        "km-xts-aes-256": false,
-+        "kmac-eaes-256": false,
-+        "kmo-eaes-128": false,
-+        "kmf-eaes-128": false,
-+        "kmc-eaes-128": false,
-+        "kmac-aes-128": false,
-+        "paie": false,
-+        "dfppc": false,
-+        "dfpzc": false,
-+        "dfphp": false,
-+        "kmo-eaes-256": false,
-+        "kmf-eaes-256": false,
-+        "kmc-eaes-256": false,
-+        "kmac-aes-256": false,
-+        "kmac-etdea-192": false,
-+        "kmac-etdea-128": false,
-+        "kmo-dea": false,
-+        "kmf-dea": false,
-+        "km-edea": false,
-+        "kmc-dea": false,
-+        "stfle49": true,
-+        "klmd-sha-1": false,
-+        "mepochptff": false,
-+        "opc": false,
-+        "ap": false,
-+        "asnlxr": false,
-+        "gpereh": false,
-+        "minste2": true,
-+        "pcc-cmac-dea": false,
-+        "vxpd": false,
-+        "vxeh": true,
-+        "esop": true,
-+        "ectg": true,
-+        "ib": false,
-+        "km-tdea-192": false,
-+        "km-tdea-128": false,
-+        "msa9_pckmo": false,
-+        "siif": false,
-+        "kma-gcm-aes-256": false,
-+        "kma-gcm-aes-192": false,
-+        "kma-gcm-aes-128": false,
-+        "pcc-cmac-aes-256": false,
-+        "tsi": false,
-+        "vxeh2": true,
-+        "tpei": false,
-+        "esort": false,
-+        "esan3": true,
-+        "fpe": true,
-+        "ibs": false,
-+        "pcc-xts-eaes-128": false,
-+        "kmac-eaes-192": false,
-+        "zarch": true,
-+        "kmo-edea": false,
-+        "kmf-edea": false,
-+        "kmc-edea": false,
-+        "kmac-dea": false,
-+        "appv": false,
-+        "apqi": false,
-+        "apft": false,
-+        "stfle53": true,
-+        "ppno-sha-512-drng": false,
-+        "pcc-cmac-tdea-128": false,
-+        "kmo-aes-256": false,
-+        "kmf-aes-256": false,
-+        "km-eaes-256": false,
-+        "kmc-aes-256": false,
-+        "els": false,
-+        "sief2": false,
-+        "eimm": true,
-+        "pcc-cmac-etdea-128": false,
-+        "iep": true,
-+        "irbm": false,
-+        "km-xts-aes-128": false,
-+        "srs": true,
-+        "appvi": false,
-+        "apqci": false,
-+        "kmo-tdea-128": false,
-+        "kmf-tdea-128": false,
-+        "km-etdea-128": false,
-+        "kmc-tdea-128": false,
-+        "kss": false,
-+        "cte": false,
-+        "kmac-edea": false,
-+        "prno-trng": true,
-+        "kma-gcm-eaes-256": false,
-+        "ais": true,
-+        "fpseh": true,
-+        "ltlbc": true,
-+        "ldisp": true,
-+        "kmo-etdea-128": false,
-+        "kmf-etdea-128": false,
-+        "kmc-etdea-128": false,
-+        "kmac-tdea-128": false,
-+        "pcc-cmac-edea": false,
-+        "bpb": false,
-+        "kmctr-edea": false,
-+        "64bscao": false,
-+        "ctop": false,
-+        "kmo-eaes-192": false,
-+        "kmf-eaes-192": false,
-+        "kmc-eaes-192": false,
-+        "kmac-aes-192": false,
-+        "gs": false,
-+        "sema": false,
-+        "etf3eh": true,
-+        "etf2eh": true,
-+        "eec": false,
-+        "pcc-cmac-eaes-192": false,
-+        "ppa15": false,
-+        "kmc-prng": false,
-+        "zpci": true,
-+        "rdp": false,
-+        "nonqks": false,
-+        "sea_esop2": true,
-+        "minste3": true,
-+        "beareh": false,
-+        "pfpo": false,
-+        "te": false,
-+        "msa8-base": true,
-+        "msa4-base": true,
-+        "msa3-base": true,
-+        "msa5-base": true,
-+        "pcc-cmac-aes-192": false,
-+        "cmm": false,
-+        "tods": false,
-+        "pcc-cmac-aes-128": false,
-+        "plo": true,
-+        "pckmo-edea": false,
-+        "gsls": false,
-+        "kmctr-aes-128": false,
-+        "skey": false,
-+        "vxpdeh2": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-5"
-+}
-+
- {
-   "return": [
-     {
-@@ -36737,5 +37081,5 @@
-       "default-ram-id": "s390.ram"
-     }
-   ],
--  "id": "libvirt-4"
-+  "id": "libvirt-5"
- }
-diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
-index 79a149d187..c3a9b62ec0 100644
---- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
-@@ -136,6 +136,7 @@
-   <flag name='chardev-reconnect-miliseconds'/>
-   <flag name='virtio-ccw.loadparm'/>
-   <flag name='netdev-stream-reconnect-miliseconds'/>
-+  <flag name='query-cpu-model-expansion.deprecated-props'/>
-   <version>9001050</version>
-   <microcodeVersion>39100247</microcodeVersion>
-   <package>v9.1.0-1348-g11b8920ed2</package>
-@@ -360,6 +361,12 @@
-     <property name='msa3-base' type='boolean' value='true'/>
-     <property name='msa5-base' type='boolean' value='true'/>
-     <property name='tods' type='boolean' value='false'/>
-+    <deprecatedFeatures>
-+      <property name='bpb'/>
-+      <property name='te'/>
-+      <property name='cte'/>
-+      <property name='csske'/>
-+    </deprecatedFeatures>
-   </hostCPU>
-   <cpu type='tcg' name='z13' typename='z13-s390x-cpu' usable='no'>
-     <blocker name='ppno-sha-512-drng'/>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu_caps-Introduce-QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW.patch b/SOURCES/libvirt-qemu_caps-Introduce-QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW.patch
deleted file mode 100644
index 821d47f..0000000
--- a/SOURCES/libvirt-qemu_caps-Introduce-QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 4cf058f2a32fac160803b45c818d798ff268b172 Mon Sep 17 00:00:00 2001
-Message-ID: <4cf058f2a32fac160803b45c818d798ff268b172.1744876588.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 15 Jan 2025 10:46:16 +0100
-Subject: [PATCH] qemu_caps: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW
-
-This capability tracks whether QEMU supports virtio-mem-ccw
-device. Introduced in QEMU commit v9.2.0-492-gaa910c20ec only
-upcoming release of QEMU supports the device.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit a46e33a92597ed03147e7f6a0c674cda55a0ec52)
-
-Conflicts:
-src/qemu/qemu_capabilities.c: Upstream has more caps added meanwhile.
-src/qemu/qemu_capabilities.h: Ditto.
-
-Resolves: https://issues.redhat.com/browse/RHEL-72976
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_capabilities.c                     | 4 ++++
- src/qemu/qemu_capabilities.h                     | 3 +++
- tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 +
- 3 files changed, 8 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 65e19965dd..1a9cf72482 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -722,6 +722,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               "virtio-ccw.loadparm", /* QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM */
-               "netdev-stream-reconnect-miliseconds", /* QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS */
-               "blockdev-set-active", /* QEMU_CAPS_BLOCKDEV_SET_ACTIVE */
-+
-+              /* 470 */
-+              "virtio-mem-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW */
-     );
- 
- 
-@@ -1411,6 +1414,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
-     { "virtio-sound-device", QEMU_CAPS_DEVICE_VIRTIO_SOUND },
-     { "sev-snp-guest", QEMU_CAPS_SEV_SNP_GUEST },
-     { "acpi-erst", QEMU_CAPS_DEVICE_ACPI_ERST },
-+    { "virtio-mem-ccw", QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW },
- };
- 
- 
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index e93e6a01cc..6467a09796 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -702,6 +702,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS, /* 'reconnect-ms' option for netdev stream supported */
-     QEMU_CAPS_BLOCKDEV_SET_ACTIVE, /* blockdev-set-active QMP command supported */
- 
-+    /* 470 */
-+    QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW, /* -device virtio-mem-ccw */
-+
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
- 
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
-index 5c5ab096d1..82cabd13b2 100644
---- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
-@@ -139,6 +139,7 @@
-   <flag name='chardev-reconnect-miliseconds'/>
-   <flag name='virtio-ccw.loadparm'/>
-   <flag name='netdev-stream-reconnect-miliseconds'/>
-+  <flag name='virtio-mem-ccw'/>
-   <version>9002050</version>
-   <microcodeVersion>39100285</microcodeVersion>
-   <package>v9.2.0-1203-gd6430c17d7</package>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu_command-Don-t-use-host-property-if-IOMMUFD-is-used.patch b/SOURCES/libvirt-qemu_command-Don-t-use-host-property-if-IOMMUFD-is-used.patch
new file mode 100644
index 0000000..a16333d
--- /dev/null
+++ b/SOURCES/libvirt-qemu_command-Don-t-use-host-property-if-IOMMUFD-is-used.patch
@@ -0,0 +1,134 @@
+From 286c9b1d27777ce5794583d94f0dfe2aed5d46c3 Mon Sep 17 00:00:00 2001
+Message-ID: <286c9b1d27777ce5794583d94f0dfe2aed5d46c3.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 19:49:16 +0100
+Subject: [PATCH] qemu_command: Don't use host property if IOMMUFD is used
+
+They should not be used at the same time.
+
+Fixes: f6230804727df834da27370e835204672218ab23
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit f67e4ac4d071f6f05ae387bc3b09c6cebb10455d)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_command.c                       | 24 +++++++++----------
+ .../iommufd-q35.x86_64-latest.args            |  2 +-
+ ...fd-virt-pci-bus-single.aarch64-latest.args |  2 +-
+ .../iommufd-virt.aarch64-latest.args          |  4 ++--
+ .../iommufd.x86_64-latest.args                |  2 +-
+ 5 files changed, 16 insertions(+), 18 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 8038aa3115..445d328358 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -4755,10 +4755,11 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
+     g_autoptr(virJSONValue) props = NULL;
+     virDomainHostdevSubsysPCI *pcisrc = &dev->source.subsys.u.pci;
+     virDomainNetTeamingInfo *teaming;
+-    g_autofree char *host = virPCIDeviceAddressAsString(&pcisrc->addr);
++    g_autofree char *host = NULL;
+     const char *failover_pair_id = NULL;
+     const char *driver = NULL;
+     const char *iommufdId = NULL;
++    const char *fdstr = NULL;
+     /* 'ramfb' property must be omitted unless it's to be enabled */
+     bool ramfb = pcisrc->ramfb == VIR_TRISTATE_SWITCH_ON;
+ 
+@@ -4792,31 +4793,28 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
+         teaming->persistent)
+         failover_pair_id = teaming->persistent;
+ 
+-    if (pcisrc->driver.iommufd == VIR_TRISTATE_BOOL_YES)
++    if (virHostdevIsPCIDeviceWithIOMMUFD(dev)) {
++        qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(dev);
++
++        fdstr = qemuFDPassDirectGetPath(hostdevPriv->vfioDeviceFd);
+         iommufdId = "iommufd0";
++    } else {
++        host = virPCIDeviceAddressAsString(&pcisrc->addr);
++    }
+ 
+     if (virJSONValueObjectAdd(&props,
+                               "s:driver", driver,
+-                              "s:host", host,
++                              "S:host", host,
+                               "s:id", dev->info->alias,
+                               "p:bootindex", dev->info->effectiveBootIndex,
+                               "S:failover_pair_id", failover_pair_id,
+                               "S:display", qemuOnOffAuto(pcisrc->display),
+                               "B:ramfb", ramfb,
+                               "S:iommufd", iommufdId,
++                              "S:fd", fdstr,
+                               NULL) < 0)
+         return NULL;
+ 
+-    if (pcisrc->driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO &&
+-        pcisrc->driver.iommufd == VIR_TRISTATE_BOOL_YES) {
+-        qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(dev);
+-
+-        if (virJSONValueObjectAdd(&props,
+-                                  "S:fd", qemuFDPassDirectGetPath(hostdevPriv->vfioDeviceFd),
+-                                  NULL) < 0)
+-            return NULL;
+-    }
+-
+     if (qemuBuildDeviceAddressProps(props, def, dev->info) < 0)
+         return NULL;
+ 
+diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
+index d5fe704021..f886c488e1 100644
+--- a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
+@@ -36,6 +36,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
+ -global ICH9-LPC.noreboot=off \
+ -watchdog-action reset \
+ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \
+--device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x3"}' \
++-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x3"}' \
+ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+ -msg timestamp=on
+diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
+index 99886468fb..d6562f9be3 100644
+--- a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
++++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
+@@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
+ -boot strict=on \
+ -audiodev '{"id":"audio1","driver":"none"}' \
+ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \
+--device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x1"}' \
++-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x1"}' \
+ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+ -msg timestamp=on
+diff --git a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
+index e3695c6982..9fd2a6adee 100644
+--- a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
++++ b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
+@@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
+ -device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \
+ -audiodev '{"id":"audio1","driver":"none"}' \
+ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \
+--device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.1","addr":"0x0"}' \
+--device '{"driver":"vfio-pci","host":"0000:07:12.5","id":"hostdev1","iommufd":"iommufd0","fd":"0","bus":"pci.2","addr":"0x0"}' \
++-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.1","addr":"0x0"}' \
++-device '{"driver":"vfio-pci","id":"hostdev1","iommufd":"iommufd0","fd":"0","bus":"pci.2","addr":"0x0"}' \
+ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+ -msg timestamp=on
+diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
+index 15dabe197c..b9aefda39d 100644
+--- a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
+@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
+ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+ -audiodev '{"id":"audio1","driver":"none"}' \
+ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \
+--device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.0","addr":"0x3"}' \
++-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.0","addr":"0x3"}' \
+ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+ -msg timestamp=on
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu_command-Extract-building-IOMMUFD-props-to-function.patch b/SOURCES/libvirt-qemu_command-Extract-building-IOMMUFD-props-to-function.patch
new file mode 100644
index 0000000..1845891
--- /dev/null
+++ b/SOURCES/libvirt-qemu_command-Extract-building-IOMMUFD-props-to-function.patch
@@ -0,0 +1,73 @@
+From a4c573319fc93a7279119df6fa3b2ff3e34bb404 Mon Sep 17 00:00:00 2001
+Message-ID: <a4c573319fc93a7279119df6fa3b2ff3e34bb404.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 20:10:50 +0100
+Subject: [PATCH] qemu_command: Extract building IOMMUFD props to function
+
+This will be reused by hotplug code.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 3f7ad3a8a5f0e453c85f186e811e051ead0f769a)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_command.c | 20 ++++++++++++++++----
+ src/qemu/qemu_command.h |  3 +++
+ 2 files changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index b866c690ae..db512f6757 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -5337,6 +5337,21 @@ qemuBuildHostdevCommandLine(virCommand *cmd,
+ }
+ 
+ 
++virJSONValue *
++qemuBuildIOMMUFDProps(qemuFDPassDirect *iommufd)
++{
++    g_autoptr(virJSONValue) props = NULL;
++
++    if (qemuMonitorCreateObjectProps(&props, "iommufd",
++                                     "iommufd0",
++                                     "S:fd", qemuFDPassDirectGetPath(iommufd),
++                                     NULL) < 0)
++        return NULL;
++
++    return g_steal_pointer(&props);
++}
++
++
+ static int
+ qemuBuildIOMMUFDCommandLine(virCommand *cmd,
+                             const virDomainDef *def,
+@@ -5350,10 +5365,7 @@ qemuBuildIOMMUFDCommandLine(virCommand *cmd,
+ 
+     qemuFDPassDirectTransferCommand(priv->iommufd, cmd);
+ 
+-    if (qemuMonitorCreateObjectProps(&props, "iommufd",
+-                                     "iommufd0",
+-                                     "S:fd", qemuFDPassDirectGetPath(priv->iommufd),
+-                                     NULL) < 0)
++    if (!(props = qemuBuildIOMMUFDProps(priv->iommufd)))
+         return -1;
+ 
+     if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0)
+diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
+index ad068f1f16..028d002ef9 100644
+--- a/src/qemu/qemu_command.h
++++ b/src/qemu/qemu_command.h
+@@ -190,6 +190,9 @@ int
+ qemuBuildRNGBackendProps(virDomainRNGDef *rng,
+                          virJSONValue **props);
+ 
++virJSONValue *
++qemuBuildIOMMUFDProps(qemuFDPassDirect *iommufd);
++
+ /* Current, best practice */
+ virJSONValue *
+ qemuBuildUSBHostdevDevProps(const virDomainDef *def,
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu_command-Use-qemuBuildVirtioDevProps-to-build-cmd-line-for-virtio-mem-and-virtio-pmem.patch b/SOURCES/libvirt-qemu_command-Use-qemuBuildVirtioDevProps-to-build-cmd-line-for-virtio-mem-and-virtio-pmem.patch
deleted file mode 100644
index 3994ff7..0000000
--- a/SOURCES/libvirt-qemu_command-Use-qemuBuildVirtioDevProps-to-build-cmd-line-for-virtio-mem-and-virtio-pmem.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 782c337fb48b56a50ed85cbfe1dc3a8a1342ac08 Mon Sep 17 00:00:00 2001
-Message-ID: <782c337fb48b56a50ed85cbfe1dc3a8a1342ac08.1744876588.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 13 Jan 2025 15:48:03 +0100
-Subject: [PATCH] qemu_command: Use qemuBuildVirtioDevProps() to build cmd line
- for virtio-mem and virtio-pmem
-
-Both, virtio-mem and virtio-pmem devices follow traditional QEMU
-naming convention: their suffix determines what bus they live on.
-For instance, virtio-mem-pci, virtio-mem-ccw, virtio-pmem-pci.
-We already have a function that constructs device name following
-this convention: qemuBuildVirtioDevGetConfigDev().
-
-While there's no virtio-pmem-ccw device yet, the function can
-still be used.
-
-Another advantage of using the function is - it'll be easier in
-future when we want to configure various virtio aspects of memory
-devices (like ats, iommu_platform, etc.).
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit 89d56c41ac16452eb5f6f27eb87658277b270f83)
-Resolves: https://issues.redhat.com/browse/RHEL-72976
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_command.c | 28 ++++++++++++++++++++++++----
- 1 file changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index b7d61edd19..fb70c79a94 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -967,6 +967,23 @@ qemuBuildVirtioDevGetConfigDev(const virDomainDeviceDef *device,
-             break;
-         }
- 
-+        case VIR_DOMAIN_DEVICE_MEMORY:
-+            switch (device->data.memory->model) {
-+            case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
-+                *baseName = "virtio-pmem";
-+                break;
-+            case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
-+                *baseName = "virtio-mem";
-+                break;
-+            case VIR_DOMAIN_MEMORY_MODEL_DIMM:
-+            case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
-+            case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
-+            case VIR_DOMAIN_MEMORY_MODEL_NONE:
-+            case VIR_DOMAIN_MEMORY_MODEL_LAST:
-+                break;
-+            }
-+            break;
-+
-         case VIR_DOMAIN_DEVICE_LEASE:
-         case VIR_DOMAIN_DEVICE_WATCHDOG:
-         case VIR_DOMAIN_DEVICE_GRAPHICS:
-@@ -979,7 +996,6 @@ qemuBuildVirtioDevGetConfigDev(const virDomainDeviceDef *device,
-         case VIR_DOMAIN_DEVICE_SHMEM:
-         case VIR_DOMAIN_DEVICE_TPM:
-         case VIR_DOMAIN_DEVICE_PANIC:
--        case VIR_DOMAIN_DEVICE_MEMORY:
-         case VIR_DOMAIN_DEVICE_IOMMU:
-         case VIR_DOMAIN_DEVICE_AUDIO:
-         case VIR_DOMAIN_DEVICE_PSTORE:
-@@ -3487,12 +3503,16 @@ qemuBuildMemoryDeviceProps(virQEMUDriverConfig *cfg,
-         break;
- 
-     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
--        device = "virtio-pmem-pci";
-+        /* Deliberately not setting @device. */
-+        if (!(props = qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_MEMORY, mem, priv->qemuCaps)))
-+            return NULL;
-         address = mem->target.virtio_pmem.address;
-         break;
- 
-     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
--        device = "virtio-mem-pci";
-+        /* Deliberately not setting @device. */
-+        if (!(props = qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_MEMORY, mem, priv->qemuCaps)))
-+            return NULL;
- 
-         if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_PREALLOC) &&
-             qemuBuildMemoryGetPagesize(cfg, def, mem, NULL, NULL, NULL, &prealloc) < 0)
-@@ -3514,7 +3534,7 @@ qemuBuildMemoryDeviceProps(virQEMUDriverConfig *cfg,
-     }
- 
-     if (virJSONValueObjectAdd(&props,
--                              "s:driver", device,
-+                              "S:driver", device,
-                               "k:node", mem->targetNode,
-                               "P:label-size", labelsize * 1024,
-                               "P:block-size", blocksize * 1024,
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu_domain-Add-missing-IOMMUFD-cleanup.patch b/SOURCES/libvirt-qemu_domain-Add-missing-IOMMUFD-cleanup.patch
new file mode 100644
index 0000000..837ea59
--- /dev/null
+++ b/SOURCES/libvirt-qemu_domain-Add-missing-IOMMUFD-cleanup.patch
@@ -0,0 +1,33 @@
+From 71ada452d793af287917d562e6b4326201fa48d2 Mon Sep 17 00:00:00 2001
+Message-ID: <71ada452d793af287917d562e6b4326201fa48d2.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sat, 14 Feb 2026 16:12:11 +0100
+Subject: [PATCH] qemu_domain: Add missing IOMMUFD cleanup
+
+If starting VM fails we would leak the FD for IOMMU device.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 7c062bfc4f8c0ba853873e72d21dba77f6ca938f)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_domain.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index bdab117e96..64b01e524f 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1975,6 +1975,8 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivate *priv)
+ 
+     priv->migrationRecoverSetup = false;
+ 
++    VIR_FORCE_CLOSE(priv->iommufd);
++
+     g_clear_pointer(&priv->memoryBackingDir, g_free);
+ }
+ 
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu_domain_address-fix-CCW-virtio-mem-hotplug.patch b/SOURCES/libvirt-qemu_domain_address-fix-CCW-virtio-mem-hotplug.patch
deleted file mode 100644
index 64fb388..0000000
--- a/SOURCES/libvirt-qemu_domain_address-fix-CCW-virtio-mem-hotplug.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 82f30944276f1cbb997ee42bad66c37cc059067e Mon Sep 17 00:00:00 2001
-Message-ID: <82f30944276f1cbb997ee42bad66c37cc059067e.1744876588.git.jdenemar@redhat.com>
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Tue, 18 Mar 2025 14:48:50 +0100
-Subject: [PATCH] qemu_domain_address: fix CCW virtio-mem hotplug
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since commit f23f8ff91a virtio-mem supports also CCW. When hotplugging a
-virtio-mem device with a CCW address results in a PCI device getting
-attached. The method qemuDomainAssignMemoryDeviceSlot is only
-considering PCI as address type and overwriting the CCW address. Adding
-support for address type CCW.
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 9ef080d6d94643fffc413127bff2b2b008a11b27)
-Resolves: https://issues.redhat.com/browse/RHEL-72976
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_domain_address.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index 970ae3949d..b73ac9ebf1 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -3073,6 +3073,7 @@ qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm,
-                                  virDomainMemoryDef *mem)
- {
-     g_autoptr(virBitmap) slotmap = NULL;
-+    bool releaseaddr = false;
-     virDomainDeviceDef dev = {.type = VIR_DOMAIN_DEVICE_MEMORY, .data.memory = mem};
- 
-     switch (mem->model) {
-@@ -3086,7 +3087,7 @@ qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm,
- 
-     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
-     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
--        return qemuDomainEnsurePCIAddress(vm, &dev);
-+        return qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev);
-         break;
- 
-     case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemu_hotplug-Add-support-to-hotplug-host-device-with-IOMMUFD.patch b/SOURCES/libvirt-qemu_hotplug-Add-support-to-hotplug-host-device-with-IOMMUFD.patch
new file mode 100644
index 0000000..6537a60
--- /dev/null
+++ b/SOURCES/libvirt-qemu_hotplug-Add-support-to-hotplug-host-device-with-IOMMUFD.patch
@@ -0,0 +1,134 @@
+From 85d04af274dbda131798bbce63773f8b71639723 Mon Sep 17 00:00:00 2001
+Message-ID: <85d04af274dbda131798bbce63773f8b71639723.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 21:21:53 +0100
+Subject: [PATCH] qemu_hotplug: Add support to hotplug host device with IOMMUFD
+
+For first host device we need to add iommufd object as well.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 5d16bef1a69500791be454239e3b9ac68ec53ace)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_hotplug.c | 39 +++++++++++++++++++++++++++++++++++++++
+ src/qemu/qemu_process.c |  4 ++--
+ src/qemu/qemu_process.h |  3 +++
+ 3 files changed, 44 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index 10ad13a416..a455c2cd53 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -1561,13 +1561,16 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver,
+     virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_HOSTDEV,
+                                { .hostdev = hostdev } };
+     virDomainDeviceInfo *info = hostdev->info;
++    qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
+     int ret;
+     g_autoptr(virJSONValue) devprops = NULL;
++    g_autoptr(virJSONValue) objprops = NULL;
+     bool releaseaddr = false;
+     bool teardowncgroup = false;
+     bool teardownlabel = false;
+     bool teardowndevice = false;
+     bool teardownmemlock = false;
++    bool removeiommufd = false;
+     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+     unsigned int flags = 0;
+ 
+@@ -1617,11 +1620,38 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver,
+         goto error;
+     }
+ 
++    if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) {
++        if (qemuProcessOpenVfioDeviceFd(hostdev) < 0)
++            goto error;
++
++        if (!priv->iommufdState) {
++            if (qemuProcessOpenIommuFd(vm) < 0)
++                goto error;
++
++            if (!(objprops = qemuBuildIOMMUFDProps(priv->iommufd)))
++                goto error;
++        }
++    }
++
+     if (!(devprops = qemuBuildPCIHostdevDevProps(vm->def, hostdev)))
+         goto error;
+ 
+     qemuDomainObjEnterMonitor(vm);
+ 
++    if (objprops) {
++        if ((ret = qemuFDPassDirectTransferMonitor(priv->iommufd, priv->mon)) < 0)
++            goto exit_monitor;
++
++        if ((ret = qemuMonitorAddObject(priv->mon, &objprops, NULL)) < 0)
++            goto exit_monitor;
++
++        priv->iommufdState = true;
++        removeiommufd = true;
++    }
++
++    if ((ret = qemuFDPassDirectTransferMonitor(hostdevPriv->vfioDeviceFd, priv->mon)) < 0)
++        goto exit_monitor;
++
+     if ((ret = qemuDomainAttachExtensionDevice(priv->mon, hostdev->info)) < 0)
+         goto exit_monitor;
+ 
+@@ -1652,6 +1682,15 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver,
+     if (teardownmemlock && qemuDomainAdjustMaxMemLock(vm) < 0)
+         VIR_WARN("Unable to reset maximum locked memory on hotplug fail");
+ 
++    if (removeiommufd) {
++        qemuDomainObjEnterMonitor(vm);
++        ignore_value(qemuMonitorDelObject(priv->mon, "iommufd0", false));
++        qemuDomainObjExitMonitor(vm);
++    }
++
++    qemuFDPassDirectTransferMonitorRollback(hostdevPriv->vfioDeviceFd, priv->mon);
++    qemuFDPassDirectTransferMonitorRollback(priv->iommufd, priv->mon);
++
+     if (releaseaddr)
+         qemuDomainReleaseDeviceAddress(vm, info);
+ 
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 59fff1aa19..1aff3a277b 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7681,7 +7681,7 @@ qemuProcessPrepareHostBackendChardevHotplug(virDomainObj *vm,
+  *
+  * Returns: 0 on success, -1 on failure
+  */
+-static int
++int
+ qemuProcessOpenIommuFd(virDomainObj *vm)
+ {
+     qemuDomainObjPrivate *priv = vm->privateData;
+@@ -7705,7 +7705,7 @@ qemuProcessOpenIommuFd(virDomainObj *vm)
+  *
+  * Returns: 0 on success, -1 on failure
+  */
+-static int
++int
+ qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev)
+ {
+     qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
+diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
+index df78b00abb..1023b7cb25 100644
+--- a/src/qemu/qemu_process.h
++++ b/src/qemu/qemu_process.h
+@@ -134,6 +134,9 @@ int qemuProcessPrepareHostBackendChardevHotplug(virDomainObj *vm,
+                                                 virDomainDeviceDef *dev)
+     ATTRIBUTE_MOCKABLE;
+ 
++int qemuProcessOpenIommuFd(virDomainObj *vm);
++
++int qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev);
+ 
+ int qemuProcessPrepareHost(virQEMUDriver *driver,
+                            virDomainObj *vm,
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu_hotplug-Fix-crash-when-attaching-network-inteface-with-hostdev-network.patch b/SOURCES/libvirt-qemu_hotplug-Fix-crash-when-attaching-network-inteface-with-hostdev-network.patch
new file mode 100644
index 0000000..3d60a47
--- /dev/null
+++ b/SOURCES/libvirt-qemu_hotplug-Fix-crash-when-attaching-network-inteface-with-hostdev-network.patch
@@ -0,0 +1,96 @@
+From dcfd8bc0e1ec0977e6911f5f566d9b1d1d27d310 Mon Sep 17 00:00:00 2001
+Message-ID: <dcfd8bc0e1ec0977e6911f5f566d9b1d1d27d310.1773154901.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Tue, 10 Mar 2026 09:34:48 +0100
+Subject: [PATCH] qemu_hotplug: Fix crash when attaching network inteface with
+ hostdev network
+
+The following interface XML will crash libvirt when attached to
+running VM:
+
+  <interface type='network'>
+    <source network='hostdev_net'/>
+  </interface>
+
+Instead of trying to figure out every single place where hostdev is used
+as struct directly and allocating empty private data check if iommufd
+is configured as that will happen only for <hostdev> device where the
+private data are correctly allocated.
+
+This patch is best viewed with `git show -w`.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 25662b3700da9c32b5083d46ff3831aa4afc2eab)
+
+Resolves: https://issues.redhat.com/browse/RHEL-151953
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_hotplug.c | 37 +++++++++++++++++++++----------------
+ 1 file changed, 21 insertions(+), 16 deletions(-)
+
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index bb88815e27..845f42bf20 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -1638,20 +1638,23 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver,
+ 
+     qemuDomainObjEnterMonitor(vm);
+ 
+-    if (objprops) {
+-        if ((ret = qemuFDPassDirectTransferMonitor(priv->iommufd, priv->mon)) < 0)
+-            goto exit_monitor;
+ 
+-        if ((ret = qemuMonitorAddObject(priv->mon, &objprops, NULL)) < 0)
+-            goto exit_monitor;
++    if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) {
++        if (objprops) {
++            if ((ret = qemuFDPassDirectTransferMonitor(priv->iommufd, priv->mon)) < 0)
++                goto exit_monitor;
+ 
+-        priv->iommufdState = true;
+-        removeiommufd = true;
++            if ((ret = qemuMonitorAddObject(priv->mon, &objprops, NULL)) < 0)
++                goto exit_monitor;
++
++            priv->iommufdState = true;
++            removeiommufd = true;
++        }
++
++        if ((ret = qemuFDPassDirectTransferMonitor(hostdevPriv->vfioDeviceFd, priv->mon)) < 0)
++            goto exit_monitor;
+     }
+ 
+-    if ((ret = qemuFDPassDirectTransferMonitor(hostdevPriv->vfioDeviceFd, priv->mon)) < 0)
+-        goto exit_monitor;
+-
+     if ((ret = qemuDomainAttachExtensionDevice(priv->mon, hostdev->info)) < 0)
+         goto exit_monitor;
+ 
+@@ -1682,15 +1685,17 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver,
+     if (teardownmemlock && qemuDomainAdjustMaxMemLock(vm) < 0)
+         VIR_WARN("Unable to reset maximum locked memory on hotplug fail");
+ 
+-    qemuDomainObjEnterMonitor(vm);
++    if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) {
++        qemuDomainObjEnterMonitor(vm);
+ 
+-    if (removeiommufd)
+-        ignore_value(qemuMonitorDelObject(priv->mon, "iommufd0", false));
++        if (removeiommufd)
++            ignore_value(qemuMonitorDelObject(priv->mon, "iommufd0", false));
+ 
+-    qemuFDPassDirectTransferMonitorRollback(hostdevPriv->vfioDeviceFd, priv->mon);
+-    qemuFDPassDirectTransferMonitorRollback(priv->iommufd, priv->mon);
++        qemuFDPassDirectTransferMonitorRollback(hostdevPriv->vfioDeviceFd, priv->mon);
++        qemuFDPassDirectTransferMonitorRollback(priv->iommufd, priv->mon);
+ 
+-    qemuDomainObjExitMonitor(vm);
++        qemuDomainObjExitMonitor(vm);
++    }
+ 
+     if (releaseaddr)
+         qemuDomainReleaseDeviceAddress(vm, info);
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu_hotplug-Remove-iommufd-object-if-no-longer-needed.patch b/SOURCES/libvirt-qemu_hotplug-Remove-iommufd-object-if-no-longer-needed.patch
new file mode 100644
index 0000000..b913be0
--- /dev/null
+++ b/SOURCES/libvirt-qemu_hotplug-Remove-iommufd-object-if-no-longer-needed.patch
@@ -0,0 +1,40 @@
+From 28d5107c5ce7488664cedd82565167e6df7b61de Mon Sep 17 00:00:00 2001
+Message-ID: <28d5107c5ce7488664cedd82565167e6df7b61de.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 19:57:12 +0100
+Subject: [PATCH] qemu_hotplug: Remove iommufd object if no longer needed
+
+When removing last host device using IOMMUFD remove the iommufd object
+as well.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 300ebf01b88d154312c1a5a684be2add95dd7f31)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_hotplug.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index 9445599d2c..10ad13a416 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -4986,6 +4986,14 @@ qemuDomainRemoveHostDevice(virQEMUDriver *driver,
+         }
+     }
+ 
++    if (priv->iommufdState &&
++        !virDomainDefHasPCIHostdevWithIOMMUFD(vm->def)) {
++        qemuDomainObjEnterMonitor(vm);
++        ignore_value(qemuMonitorDelObject(priv->mon, "iommufd0", false));
++        qemuDomainObjExitMonitor(vm);
++        priv->iommufdState = false;
++    }
++
+     virDomainAuditHostdev(vm, hostdev, "detach", true);
+ 
+     if (!virHostdevIsPCIDevice(hostdev) &&
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu_hotplug-enter-monitor-in-order-to-rollback-passed-FD.patch b/SOURCES/libvirt-qemu_hotplug-enter-monitor-in-order-to-rollback-passed-FD.patch
new file mode 100644
index 0000000..8d1a04b
--- /dev/null
+++ b/SOURCES/libvirt-qemu_hotplug-enter-monitor-in-order-to-rollback-passed-FD.patch
@@ -0,0 +1,46 @@
+From cff0f011f46b13ae363b9938e65a071584b16327 Mon Sep 17 00:00:00 2001
+Message-ID: <cff0f011f46b13ae363b9938e65a071584b16327.1772815374.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Thu, 26 Feb 2026 10:54:18 +0100
+Subject: [PATCH] qemu_hotplug: enter monitor in order to rollback passed FD
+
+Reported-by: Peter Krempa <pkrempa@redhat.com>
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 4374dbbbf0d87f0052dd96be96baad6c20963713)
+
+https://issues.redhat.com/browse/RHEL-151953
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_hotplug.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index a455c2cd53..bb88815e27 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -1682,15 +1682,16 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver,
+     if (teardownmemlock && qemuDomainAdjustMaxMemLock(vm) < 0)
+         VIR_WARN("Unable to reset maximum locked memory on hotplug fail");
+ 
+-    if (removeiommufd) {
+-        qemuDomainObjEnterMonitor(vm);
++    qemuDomainObjEnterMonitor(vm);
++
++    if (removeiommufd)
+         ignore_value(qemuMonitorDelObject(priv->mon, "iommufd0", false));
+-        qemuDomainObjExitMonitor(vm);
+-    }
+ 
+     qemuFDPassDirectTransferMonitorRollback(hostdevPriv->vfioDeviceFd, priv->mon);
+     qemuFDPassDirectTransferMonitorRollback(priv->iommufd, priv->mon);
+ 
++    qemuDomainObjExitMonitor(vm);
++
+     if (releaseaddr)
+         qemuDomainReleaseDeviceAddress(vm, info);
+ 
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu_migration-Do-not-automatically-resume-domain-after-I-O-error.patch b/SOURCES/libvirt-qemu_migration-Do-not-automatically-resume-domain-after-I-O-error.patch
deleted file mode 100644
index d86ac90..0000000
--- a/SOURCES/libvirt-qemu_migration-Do-not-automatically-resume-domain-after-I-O-error.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From cfb90039fe0972c316fc28ca1d6bcc6343431fc3 Mon Sep 17 00:00:00 2001
-Message-ID: <cfb90039fe0972c316fc28ca1d6bcc6343431fc3.1739824249.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 15 Jan 2025 16:02:00 +0100
-Subject: [PATCH] qemu_migration: Do not automatically resume domain after I/O
- error
-
-When an I/O error happens (causing a domain to be paused) during live
-migration which is later cancelled by a user, trying to resume the
-domain doesn't make sense.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 3766891c5954c53370d7eb9c7a0a8e6ba3854ca4)
-
-https://issues.redhat.com/browse/RHEL-79168
----
- src/qemu/qemu_migration.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index fe0b9fc672..4112e95a1e 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -241,6 +241,11 @@ qemuMigrationSrcRestoreDomainState(virQEMUDriver *driver, virDomainObj *vm)
-         reason == VIR_DOMAIN_PAUSED_POSTCOPY_FAILED)
-         return;
- 
-+    if (reason == VIR_DOMAIN_PAUSED_IOERROR) {
-+        VIR_DEBUG("Domain is paused due to I/O error, skipping resume");
-+        return;
-+    }
-+
-     VIR_DEBUG("Restoring pre-migration state due to migration error");
- 
-     /* we got here through some sort of failure; start the domain again */
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu_migration-Do-not-consider-post-copy-active-in-postcopy-recover.patch b/SOURCES/libvirt-qemu_migration-Do-not-consider-post-copy-active-in-postcopy-recover.patch
deleted file mode 100644
index 78b764f..0000000
--- a/SOURCES/libvirt-qemu_migration-Do-not-consider-post-copy-active-in-postcopy-recover.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 50925d10476e7a61d25de6e501a4954bb427c327 Mon Sep 17 00:00:00 2001
-Message-ID: <50925d10476e7a61d25de6e501a4954bb427c327.1737030652.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 10 Jan 2025 18:25:20 +0100
-Subject: [PATCH] qemu_migration: Do not consider post-copy active in
- postcopy-recover
-
-The postcopy-recover migration state in QEMU means a connection for the
-migration stream was established. Depending on the schedulers on both
-hosts a relative timing of the corresponding MIGRATION event on the
-source host and the destination host may differ. Specifically it's
-possible that the source sees postcopy-recover while the destination is
-still in postcopy-paused.
-
-Currently the Perform phase on the source host ends when we get
-postcopy-recover event and the Finish phase on the destination host is
-called. If this is fast enough we can still see postcopy-paused state
-when the Finish phase starts waiting for migration to complete. This is
-interpreted as a failure and reported back to the caller. Even though
-the recovery may actually start just a few moments later.
-
-To avoid this race we now don't consider post-copy migration active in
-postcopy-recover state and keep waiting for postcopy-active event (in
-the success path). Thus the Finish phase is entered only after the
-migration switches to postcopy-active. In this state QEMU guarantees the
-destination already switched at least to postcopy-recover and we won't
-be confused be seeing an old postcopy-failed state.
-
-https://issues.redhat.com/browse/RHEL-73085
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com
-(cherry picked from commit a71985f6f3fec52e2a6f4e3991ed9bf6280bdb4b)
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_migration.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 26a92d8ee2..b2b172a26c 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -1872,11 +1872,11 @@ qemuMigrationUpdateJobType(virDomainJobData *jobData)
- 
-     switch ((qemuMonitorMigrationStatus) priv->stats.mig.status) {
-     case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY:
--    case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY_RECOVER:
-         jobData->status = VIR_DOMAIN_JOB_STATUS_POSTCOPY;
-         break;
- 
-     case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY_RECOVER_SETUP:
-+    case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY_RECOVER:
-         jobData->status = VIR_DOMAIN_JOB_STATUS_POSTCOPY_RECOVER;
-         break;
- 
--- 
-2.47.1
diff --git a/SOURCES/libvirt-qemu_migration-Refactor-qemuMigrationSrcRestoreDomainState.patch b/SOURCES/libvirt-qemu_migration-Refactor-qemuMigrationSrcRestoreDomainState.patch
deleted file mode 100644
index 2284922..0000000
--- a/SOURCES/libvirt-qemu_migration-Refactor-qemuMigrationSrcRestoreDomainState.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 68d485113af90e52dfa52c40f2192b524f31de4f Mon Sep 17 00:00:00 2001
-Message-ID: <68d485113af90e52dfa52c40f2192b524f31de4f.1739824249.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 15 Jan 2025 15:59:22 +0100
-Subject: [PATCH] qemu_migration: Refactor qemuMigrationSrcRestoreDomainState
-
-None of the callers really care about the return value so we can drop it
-and simplify the code a bit.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit e46e64be501cd670a3f224fabd97705fb01c6f85)
-
-https://issues.redhat.com/browse/RHEL-79168
----
- src/qemu/qemu_migration.c | 64 +++++++++++++++++----------------------
- 1 file changed, 28 insertions(+), 36 deletions(-)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index b2b172a26c..fe0b9fc672 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -219,57 +219,49 @@ qemuMigrationSrcStoreDomainState(virDomainObj *vm)
-               priv->preMigrationState, vm);
- }
- 
--/* Returns true if the domain was resumed, false otherwise */
--static bool
-+
-+static void
- qemuMigrationSrcRestoreDomainState(virQEMUDriver *driver, virDomainObj *vm)
- {
-     qemuDomainObjPrivate *priv = vm->privateData;
-+    virDomainState preMigrationState = priv->preMigrationState;
-     int reason;
-     virDomainState state = virDomainObjGetState(vm, &reason);
--    bool ret = false;
-+
-+    priv->preMigrationState = VIR_DOMAIN_NOSTATE;
- 
-     VIR_DEBUG("driver=%p, vm=%p, pre-mig-state=%s, state=%s, reason=%s",
-               driver, vm,
--              virDomainStateTypeToString(priv->preMigrationState),
-+              virDomainStateTypeToString(preMigrationState),
-               virDomainStateTypeToString(state),
-               virDomainStateReasonToString(state, reason));
- 
--    if (state != VIR_DOMAIN_PAUSED ||
-+    if (preMigrationState != VIR_DOMAIN_RUNNING ||
-+        state != VIR_DOMAIN_PAUSED ||
-         reason == VIR_DOMAIN_PAUSED_POSTCOPY_FAILED)
--        goto cleanup;
-+        return;
- 
--    if (priv->preMigrationState == VIR_DOMAIN_RUNNING) {
--        /* This is basically the only restore possibility that's safe
--         * and we should attempt to do */
--
--        VIR_DEBUG("Restoring pre-migration state due to migration error");
--
--        /* we got here through some sort of failure; start the domain again */
--        if (qemuProcessStartCPUs(driver, vm,
--                                 VIR_DOMAIN_RUNNING_MIGRATION_CANCELED,
--                                 VIR_ASYNC_JOB_MIGRATION_OUT) < 0) {
--            /* Hm, we already know we are in error here.  We don't want to
--             * overwrite the previous error, though, so we just throw something
--             * to the logs and hope for the best */
--            VIR_ERROR(_("Failed to resume guest %1$s after failure"), vm->def->name);
--            if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
--                virObjectEvent *event;
--
--                virDomainObjSetState(vm, VIR_DOMAIN_PAUSED,
--                                     VIR_DOMAIN_PAUSED_API_ERROR);
--                event = virDomainEventLifecycleNewFromObj(vm,
--                                                          VIR_DOMAIN_EVENT_SUSPENDED,
--                                                          VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
--                virObjectEventStateQueue(driver->domainEventState, event);
--            }
--            goto cleanup;
-+    VIR_DEBUG("Restoring pre-migration state due to migration error");
-+
-+    /* we got here through some sort of failure; start the domain again */
-+    if (qemuProcessStartCPUs(driver, vm,
-+                             VIR_DOMAIN_RUNNING_MIGRATION_CANCELED,
-+                             VIR_ASYNC_JOB_MIGRATION_OUT) < 0) {
-+        /* Hm, we already know we are in error here.  We don't want to
-+         * overwrite the previous error, though, so we just throw something
-+         * to the logs and hope for the best */
-+        VIR_ERROR(_("Failed to resume guest %1$s after failure"), vm->def->name);
-+        if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
-+            virObjectEvent *event;
-+
-+            virDomainObjSetState(vm, VIR_DOMAIN_PAUSED,
-+                                 VIR_DOMAIN_PAUSED_API_ERROR);
-+            event = virDomainEventLifecycleNewFromObj(vm,
-+                                                      VIR_DOMAIN_EVENT_SUSPENDED,
-+                                                      VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
-+            virObjectEventStateQueue(driver->domainEventState, event);
-         }
--        ret = true;
-     }
--
-- cleanup:
--    priv->preMigrationState = VIR_DOMAIN_NOSTATE;
--    return ret;
- }
- 
- 
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu_process-Fix-FD-leak-with-multiple-host-devices-using-IOMMUFD.patch b/SOURCES/libvirt-qemu_process-Fix-FD-leak-with-multiple-host-devices-using-IOMMUFD.patch
new file mode 100644
index 0000000..fdb42e9
--- /dev/null
+++ b/SOURCES/libvirt-qemu_process-Fix-FD-leak-with-multiple-host-devices-using-IOMMUFD.patch
@@ -0,0 +1,48 @@
+From 84ff22de6dd06a6e63cb989cf58ec0e8eb44fb06 Mon Sep 17 00:00:00 2001
+Message-ID: <84ff22de6dd06a6e63cb989cf58ec0e8eb44fb06.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 19:13:19 +0100
+Subject: [PATCH] qemu_process: Fix FD leak with multiple host devices using
+ IOMMUFD
+
+We would open IOMMU device for each host device with IOMMUFD backend
+leaking FD except for the last one. Since we are adding only single
+iommufd object we need to open it only once.
+
+Fixes: 2f0999a161910e3992458902ce90d37f8b8f2642
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit d194f362f342c22731670e365e8a2681759dbc57)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_process.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 3bd81c55b3..da7a9fc11f 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7736,13 +7736,15 @@ qemuProcessOpenVfioFds(virDomainObj *vm)
+             /* Open VFIO device FD */
+             if (qemuProcessOpenVfioDeviceFd(hostdev) < 0)
+                 return -1;
+-
+-            /* Open IOMMU FD */
+-            if (qemuProcessOpenIommuFd(vm) < 0)
+-                return -1;
+         }
+     }
+ 
++    /* Open IOMMU FD */
++    if (virDomainDefHasPCIHostdevWithIOMMUFD(vm->def) &&
++        qemuProcessOpenIommuFd(vm) < 0) {
++        return -1;
++    }
++
+     return 0;
+ }
+ 
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenIommuFd.patch b/SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenIommuFd.patch
new file mode 100644
index 0000000..37aa882
--- /dev/null
+++ b/SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenIommuFd.patch
@@ -0,0 +1,72 @@
+From cad077e78e649f2d076170228476bff939d2af67 Mon Sep 17 00:00:00 2001
+Message-ID: <cad077e78e649f2d076170228476bff939d2af67.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 19:01:35 +0100
+Subject: [PATCH] qemu_process: Refactor qemuProcessOpenIommuFd
+
+This will allow us reusing same code for hotplug.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit ff2848827f42578115ef54a389a41798a96fd338)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_process.c | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index dd165512f3..71770d2099 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7676,24 +7676,23 @@ qemuProcessPrepareHostBackendChardevHotplug(virDomainObj *vm,
+ /**
+  * qemuProcessOpenIommuFd:
+  * @vm: domain object
+- * @iommuFd: returned file descriptor
+  *
+  * Opens /dev/iommu file descriptor for the VM.
+  *
+- * Returns: FD on success, -1 on failure
++ * Returns: 0 on success, -1 on failure
+  */
+ static int
+ qemuProcessOpenIommuFd(virDomainObj *vm)
+ {
+-    int fd = -1;
++    qemuDomainObjPrivate *priv = vm->privateData;
+ 
+     VIR_DEBUG("Opening IOMMU FD for domain %s", vm->def->name);
+ 
+-    if ((fd = virIOMMUFDOpenDevice()) < 0)
++    if ((priv->iommufd = virIOMMUFDOpenDevice()) < 0)
+         return -1;
+ 
+-    VIR_DEBUG("Opened IOMMU FD %d for domain %s", fd, vm->def->name);
+-    return fd;
++    VIR_DEBUG("Opened IOMMU FD %d for domain %s", priv->iommufd, vm->def->name);
++    return 0;
+ }
+ 
+ /**
+@@ -7750,7 +7749,6 @@ qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev)
+ static int
+ qemuProcessOpenVfioFds(virDomainObj *vm)
+ {
+-    qemuDomainObjPrivate *priv = vm->privateData;
+     size_t i;
+ 
+     /* Check if we have any hostdevs that need VFIO FDs */
+@@ -7768,8 +7766,7 @@ qemuProcessOpenVfioFds(virDomainObj *vm)
+                  return -1;
+ 
+             /* Open IOMMU FD */
+-            priv->iommufd = qemuProcessOpenIommuFd(vm);
+-            if (priv->iommufd == -1)
++            if (qemuProcessOpenIommuFd(vm) < 0)
+                 return -1;
+         }
+     }
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenVfioDeviceFd.patch b/SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenVfioDeviceFd.patch
new file mode 100644
index 0000000..7694b1f
--- /dev/null
+++ b/SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenVfioDeviceFd.patch
@@ -0,0 +1,75 @@
+From 65e187a6570ba7d7fa4eeff42353d6aa3f6f802d Mon Sep 17 00:00:00 2001
+Message-ID: <65e187a6570ba7d7fa4eeff42353d6aa3f6f802d.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 19:09:23 +0100
+Subject: [PATCH] qemu_process: Refactor qemuProcessOpenVfioDeviceFd
+
+This will allow us reusing same code for hotplug support.
+As part of refactor remove redundant checks.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 76b720168bee49497519bbca2147cbd65ae7fcbf)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_process.c | 22 +++++++++-------------
+ 1 file changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 55cd930df8..7e32325fa0 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7698,23 +7698,21 @@ qemuProcessOpenIommuFd(virDomainObj *vm)
+ /**
+  * qemuProcessOpenVfioDeviceFd:
+  * @hostdev: host device definition
+- * @vfioFd: returned file descriptor
+  *
+  * Opens the VFIO device file descriptor for a hostdev.
+  *
+- * Returns: FD on success, -1 on failure
++ * Returns: 0 on success, -1 on failure
+  */
+ static int
+ qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev)
+ {
+-    if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
+-        hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+-                       _("VFIO FD only supported for PCI hostdevs"));
+-        return -1;
+-    }
++    qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
++    virDomainHostdevSubsysPCI *pci = &hostdev->source.subsys.u.pci;
+ 
+-    return virPCIDeviceOpenVfioFd(&hostdev->source.subsys.u.pci.addr);
++    if ((hostdevPriv->vfioDeviceFd = virPCIDeviceOpenVfioFd(&pci->addr)) < 0)
++        return -1;
++
++    return 0;
+ }
+ 
+ /**
+@@ -7733,16 +7731,14 @@ qemuProcessOpenVfioFds(virDomainObj *vm)
+     /* Check if we have any hostdevs that need VFIO FDs */
+     for (i = 0; i < vm->def->nhostdevs; i++) {
+         virDomainHostdevDef *hostdev = vm->def->hostdevs[i];
+-        qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
+ 
+         if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
+             hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
+             hostdev->source.subsys.u.pci.driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO &&
+             hostdev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES) {
+             /* Open VFIO device FD */
+-            hostdevPriv->vfioDeviceFd = qemuProcessOpenVfioDeviceFd(hostdev);
+-            if (hostdevPriv->vfioDeviceFd == -1)
+-                 return -1;
++            if (qemuProcessOpenVfioDeviceFd(hostdev) < 0)
++                return -1;
+ 
+             /* Open IOMMU FD */
+             if (qemuProcessOpenIommuFd(vm) < 0)
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenVfioFds.patch b/SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenVfioFds.patch
new file mode 100644
index 0000000..9236b57
--- /dev/null
+++ b/SOURCES/libvirt-qemu_process-Refactor-qemuProcessOpenVfioFds.patch
@@ -0,0 +1,77 @@
+From eb555cecb3894ddc890c9f0fc099d2210b2bfb62 Mon Sep 17 00:00:00 2001
+Message-ID: <eb555cecb3894ddc890c9f0fc099d2210b2bfb62.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 19:15:52 +0100
+Subject: [PATCH] qemu_process: Refactor qemuProcessOpenVfioFds
+
+Follow our switch pattern to simplify the code logic
+and rename the function to follow our naming pattern.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit c83b4f367f23868793fc6b071771d0e641b7a546)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/qemu/qemu_process.c | 31 ++++++++++++++++---------------
+ 1 file changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index da7a9fc11f..3729edcd7e 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7715,27 +7715,28 @@ qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev)
+     return 0;
+ }
+ 
+-/**
+- * qemuProcessOpenVfioFds:
+- * @vm: domain object
+- *
+- * Opens all necessary VFIO file descriptors for the domain.
+- *
+- * Returns: 0 on success, -1 on failure
+- */
+ static int
+-qemuProcessOpenVfioFds(virDomainObj *vm)
++qemuProcessPrepareHostHostdev(virDomainObj *vm)
+ {
+     size_t i;
+ 
+-    /* Check if we have any hostdevs that need VFIO FDs */
+     for (i = 0; i < vm->def->nhostdevs; i++) {
+         virDomainHostdevDef *hostdev = vm->def->hostdevs[i];
+ 
+-        if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) {
+-            /* Open VFIO device FD */
+-            if (qemuProcessOpenVfioDeviceFd(hostdev) < 0)
+-                return -1;
++        switch (hostdev->source.subsys.type) {
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
++            if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) {
++                /* Open VFIO device FD */
++                if (qemuProcessOpenVfioDeviceFd(hostdev) < 0)
++                    return -1;
++            }
++            break;
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
++            break;
+         }
+     }
+ 
+@@ -7803,7 +7804,7 @@ qemuProcessPrepareHost(virQEMUDriver *driver,
+         hostdev_flags |= VIR_HOSTDEV_COLD_BOOT;
+     if (qemuHostdevPrepareDomainDevices(driver, vm->def, hostdev_flags) < 0)
+         return -1;
+-    if (qemuProcessOpenVfioFds(vm) < 0)
++    if (qemuProcessPrepareHostHostdev(vm) < 0)
+         return -1;
+ 
+     VIR_DEBUG("Preparing chr device backends");
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemu_snapshot-allow-reverting-to-external-disk-only-snapshot.patch b/SOURCES/libvirt-qemu_snapshot-allow-reverting-to-external-disk-only-snapshot.patch
deleted file mode 100644
index 1354549..0000000
--- a/SOURCES/libvirt-qemu_snapshot-allow-reverting-to-external-disk-only-snapshot.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b0282d5149f90b155a38881f92e3263bd23d9878 Mon Sep 17 00:00:00 2001
-Message-ID: <b0282d5149f90b155a38881f92e3263bd23d9878.1741876175.git.jdenemar@redhat.com>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Wed, 31 Jan 2024 17:14:28 +0100
-Subject: [PATCH] qemu_snapshot: allow reverting to external disk only snapshot
-
-When snapshot is created with disk-only flag it is always external
-snapshot without memory state. Historically when there was not support
-to revert external snapshots this produced error message.
-
-    error: Failed to revert snapshot s1
-    error: internal error: Invalid target domain state 'disk-snapshot'. Refusing snapshot reversion
-
-Now we can simply consider this as reverting to offline snapshot as the
-possible damage to file system is already done at the point of snapshot
-creation.
-
-Resolves: https://issues.redhat.com/browse/RHEL-21549
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 443ae4adec3a94a575ea2acaa112188e721c7dfe)
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
----
- src/qemu/qemu_snapshot.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
-index b1f4ebb995..3a8510c69e 100644
---- a/src/qemu/qemu_snapshot.c
-+++ b/src/qemu/qemu_snapshot.c
-@@ -2884,6 +2884,7 @@ qemuSnapshotRevert(virDomainObj *vm,
-     case VIR_DOMAIN_SNAPSHOT_SHUTDOWN:
-     case VIR_DOMAIN_SNAPSHOT_SHUTOFF:
-     case VIR_DOMAIN_SNAPSHOT_CRASHED:
-+    case VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT:
-         ret = qemuSnapshotRevertInactive(vm, snapshot, snap,
-                                          driver, cfg,
-                                          &inactiveConfig,
-@@ -2895,8 +2896,6 @@ qemuSnapshotRevert(virDomainObj *vm,
-                        _("qemu doesn't support reversion of snapshot taken in PMSUSPENDED state"));
-         goto endjob;
- 
--    case VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT:
--        /* Rejected earlier as an external snapshot */
-     case VIR_DOMAIN_SNAPSHOT_NOSTATE:
-     case VIR_DOMAIN_SNAPSHOT_BLOCKED:
-     case VIR_DOMAIN_SNAPSHOT_LAST:
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemu_validate-Drop-VIR_DOMAIN_HYPERV_STIMER-dependency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch b/SOURCES/libvirt-qemu_validate-Drop-VIR_DOMAIN_HYPERV_STIMER-dependency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch
new file mode 100644
index 0000000..07ca1fc
--- /dev/null
+++ b/SOURCES/libvirt-qemu_validate-Drop-VIR_DOMAIN_HYPERV_STIMER-dependency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch
@@ -0,0 +1,69 @@
+From ba255cecade6c9f690997b53bfe517eef341695a Mon Sep 17 00:00:00 2001
+Message-ID: <ba255cecade6c9f690997b53bfe517eef341695a.1768317034.git.jdenemar@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 6 Jan 2026 14:37:23 +0100
+Subject: [PATCH] qemu_validate: Drop VIR_DOMAIN_HYPERV_STIMER dependency on
+ VIR_DOMAIN_HYPERV_VPINDEX
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The original commit (v11.9.0-rc1~84) added a dependency checking
+of VIR_DOMAIN_HYPERV_STIMER on VIR_DOMAIN_HYPERV_VPINDEX
+(meaning, if stimer is on then vpindex must also be on). It
+justified this by citing QEMU documentation:
+
+Per QEMU documentation (docs/system/i386/hyperv.rst):
+
+``hv-stimer``
+  Enables Hyper-V synthetic timers. <snip/>
+
+  Requires: ``hv-vpindex``, ``hv-synic``, ``hv-time``
+
+While the documentation is almost correct (see previous commit
+when it's incorrect), the code express no dependency on vpindex
+(kvm_hyperv_properties[] array from target/i386/kvm/kvm.c):
+
+    [HYPERV_FEAT_STIMER] = {
+        .desc = "synthetic timers (hv-stimer)",
+        .flags = {
+            {.func = HV_CPUID_FEATURES, .reg = R_EAX,
+             .bits = HV_SYNTIMERS_AVAILABLE}
+        },
+        .dependencies = BIT(HYPERV_FEAT_SYNIC) | BIT(HYPERV_FEAT_TIME)
+    },
+
+If transitivity is taken into account then the documentation is
+of course correct (minus that one aforementioned special case).
+Well, there's no need for us to implement transitional checks.
+VIR_DOMAIN_HYPERV_STIMER requires VIR_DOMAIN_HYPERV_SYNIC and
+whether that requires VIR_DOMAIN_HYPERV_VPINDEX is another
+question.
+
+Just drop the transitive check.
+
+Resolves: https://gitlab.com/libvirt/libvirt/-/issues/837
+Resolves: https://issues.redhat.com/browse/RHEL-138689
+Fixes: da261327ea94300d1aa2d3b76ba9dcd4de6160f6
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 6df374fefc94f5e729870dfe1ff65b62ee986fce)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_validate.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
+index 3e27c11da3..66c59c3696 100644
+--- a/src/qemu/qemu_validate.c
++++ b/src/qemu/qemu_validate.c
+@@ -122,7 +122,6 @@ qemuValidateDomainDefHypervFeatures(const virDomainDef *def)
+         }
+     }
+ 
+-    CHECK_HV_FEAT(VIR_DOMAIN_HYPERV_STIMER, VIR_DOMAIN_HYPERV_VPINDEX);
+     CHECK_HV_FEAT(VIR_DOMAIN_HYPERV_STIMER, VIR_DOMAIN_HYPERV_SYNIC);
+ 
+     CHECK_HV_FEAT(VIR_DOMAIN_HYPERV_TLBFLUSH, VIR_DOMAIN_HYPERV_VPINDEX);
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemu_validate-Drop-VIR_DOMAIN_HYPERV_SYNIC-dependency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch b/SOURCES/libvirt-qemu_validate-Drop-VIR_DOMAIN_HYPERV_SYNIC-dependency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch
new file mode 100644
index 0000000..ff754c1
--- /dev/null
+++ b/SOURCES/libvirt-qemu_validate-Drop-VIR_DOMAIN_HYPERV_SYNIC-dependency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch
@@ -0,0 +1,47 @@
+From e9a4c12db5da26084d8ec03b9249a53f980b3ad3 Mon Sep 17 00:00:00 2001
+Message-ID: <e9a4c12db5da26084d8ec03b9249a53f980b3ad3.1768317034.git.jdenemar@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 6 Jan 2026 12:03:56 +0100
+Subject: [PATCH] qemu_validate: Drop VIR_DOMAIN_HYPERV_SYNIC dependency on
+ VIR_DOMAIN_HYPERV_VPINDEX
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Turns out, that synic hyperv enlightenment not always requires
+vpindex. Some (older) machine types (e.g. pc-i440fx-3.0,
+pc-q35-3.0, pc-i440fx-rhel7.6.0) can run with synic enabled and vpindex
+disabled. This is because they did enable 'x-hv-synic-kvm-only'
+CPU property, but starting from QEMU commit v3.1.0-rc0~44^2~9 the
+property is disabled by default.
+
+To avoid parsing machine type version, let's just drop this
+dependency validation and rely on QEMU to report sensible error
+message.
+
+Resolves: https://gitlab.com/libvirt/libvirt/-/issues/837
+Resolves: https://issues.redhat.com/browse/RHEL-138689
+Fixes: 1822d030c32d9857020ee8385b0a8808a29a472f
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 8e9a9f86b046c5bc917875f4b3854f13c4b33b55)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_validate.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
+index da08fd17cd..3e27c11da3 100644
+--- a/src/qemu/qemu_validate.c
++++ b/src/qemu/qemu_validate.c
+@@ -112,8 +112,6 @@ qemuValidateDomainDefHypervFeatures(const virDomainDef *def)
+         return -1;
+     }
+ 
+-    CHECK_HV_FEAT(VIR_DOMAIN_HYPERV_SYNIC, VIR_DOMAIN_HYPERV_VPINDEX);
+-
+     if (def->hyperv.features[VIR_DOMAIN_HYPERV_STIMER] == VIR_TRISTATE_SWITCH_ON) {
+         if (!virDomainDefHasTimer(def, VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK)) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemublocktest-Iterate-all-nodenames-in-testQemuDetectBitmaps.patch b/SOURCES/libvirt-qemublocktest-Iterate-all-nodenames-in-testQemuDetectBitmaps.patch
new file mode 100644
index 0000000..2905259
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Iterate-all-nodenames-in-testQemuDetectBitmaps.patch
@@ -0,0 +1,175 @@
+From 4930e34b488c6253e8cbb5ceb2988864f7b981a0 Mon Sep 17 00:00:00 2001
+Message-ID: <4930e34b488c6253e8cbb5ceb2988864f7b981a0.1770203323.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 27 Jan 2026 22:49:09 +0100
+Subject: [PATCH] qemublocktest: Iterate all nodenames in
+ 'testQemuDetectBitmaps'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Rather than looking for 30 specific nodenames (via a loop) iterate
+everything in the hash table (in a sorted order). This simplifies the
+code and provides more test outputs on previously-ignored nodenames.
+
+The listing of internal snapshots in the output was also missing a
+newline, which would now cause problems with multiple images reproted.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 71643c197e86a3adc792c0b2a378a245ae6c5756)
+
+https://issues.redhat.com/browse/RHEL-145769 [rhel-10.2]
+https://issues.redhat.com/browse/RHEL-145770 [rhel-9.8]
+---
+ tests/qemublocktest.c                         | 24 +++++++------------
+ tests/qemublocktestdata/bitmap/basic.out      |  1 +
+ tests/qemublocktestdata/bitmap/empty.out      |  1 +
+ .../bitmap/snapshots-internal.out             |  7 ++++++
+ tests/qemublocktestdata/bitmap/snapshots.out  |  5 ++++
+ tests/qemublocktestdata/bitmap/synthetic.out  |  5 ++++
+ 6 files changed, 28 insertions(+), 15 deletions(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 47746207cc..51d9268cdd 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -575,17 +575,15 @@ testQemuImageCreate(const void *opaque)
+ 
+ static const char *bitmapDetectPrefix = "qemublocktestdata/bitmap/";
+ 
+-static void
+-testQemuDetectBitmapsWorker(GHashTable *nodedata,
++static int
++testQemuDetectBitmapsWorker(void *payload,
+                             const char *nodename,
+-                            virBuffer *buf)
++                            void *opaque)
+ {
+-    qemuBlockNamedNodeData *data;
++    qemuBlockNamedNodeData *data = payload;
++    virBuffer *buf = opaque;
+     size_t i;
+ 
+-    if (!(data = virHashLookup(nodedata, nodename)))
+-        return;
+-
+     virBufferAsprintf(buf, "%s:\n", nodename);
+     if (data->qcow2v2)
+         virBufferAddLit(buf, " qcow2 v2\n");
+@@ -617,9 +615,12 @@ testQemuDetectBitmapsWorker(GHashTable *nodedata,
+ 
+             virBufferAsprintf(buf, " '%s'%s", (const char *) n->key, vms);
+         }
++
++        virBufferAddLit(buf, "\n");
+     }
+ 
+     virBufferAdjustIndent(buf, -1);
++    return 0;
+ }
+ 
+ 
+@@ -632,7 +633,6 @@ testQemuDetectBitmaps(const void *opaque)
+     g_autofree char *actual = NULL;
+     g_autofree char *expectpath = NULL;
+     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+-    size_t i;
+ 
+     expectpath = g_strdup_printf("%s/%s%s.out", abs_srcdir,
+                                  bitmapDetectPrefix, name);
+@@ -646,13 +646,7 @@ testQemuDetectBitmaps(const void *opaque)
+         return -1;
+     }
+ 
+-    /* we detect for the first 30 nodenames for simplicity */
+-    for (i = 0; i < 30; i++) {
+-        g_autofree char *nodename = g_strdup_printf("libvirt-%zu-format", i);
+-
+-        testQemuDetectBitmapsWorker(nodedata, nodename, &buf);
+-    }
+-
++    virHashForEachSorted(nodedata, testQemuDetectBitmapsWorker, &buf);
+     actual = virBufferContentAndReset(&buf);
+ 
+     return virTestCompareToFile(actual, expectpath);
+diff --git a/tests/qemublocktestdata/bitmap/basic.out b/tests/qemublocktestdata/bitmap/basic.out
+index 5c4c35b3f0..b96ffe3d39 100644
+--- a/tests/qemublocktestdata/bitmap/basic.out
++++ b/tests/qemublocktestdata/bitmap/basic.out
+@@ -4,3 +4,4 @@ libvirt-1-format:
+         c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-1-storage:
+diff --git a/tests/qemublocktestdata/bitmap/empty.out b/tests/qemublocktestdata/bitmap/empty.out
+index 3787cbd354..c9a5be4f07 100644
+--- a/tests/qemublocktestdata/bitmap/empty.out
++++ b/tests/qemublocktestdata/bitmap/empty.out
+@@ -1 +1,2 @@
+ libvirt-1-format:
++libvirt-1-storage:
+diff --git a/tests/qemublocktestdata/bitmap/snapshots-internal.out b/tests/qemublocktestdata/bitmap/snapshots-internal.out
+index dbb3cfded4..cf7bde96a5 100644
+--- a/tests/qemublocktestdata/bitmap/snapshots-internal.out
++++ b/tests/qemublocktestdata/bitmap/snapshots-internal.out
+@@ -1,2 +1,9 @@
+ libvirt-1-format:
+  internal snapshots: '1727868651'(*) '1727872064'(*)
++libvirt-1-storage:
++libvirt-2-storage:
++libvirt-pflash0-format:
++libvirt-pflash0-storage:
++libvirt-pflash1-format:
++ internal snapshots: '1727868651' '1727872064'
++libvirt-pflash1-storage:
+diff --git a/tests/qemublocktestdata/bitmap/snapshots.out b/tests/qemublocktestdata/bitmap/snapshots.out
+index 24ca27e4d8..29c586be7e 100644
+--- a/tests/qemublocktestdata/bitmap/snapshots.out
++++ b/tests/qemublocktestdata/bitmap/snapshots.out
+@@ -4,16 +4,21 @@ libvirt-1-format:
+         b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+   current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-1-storage:
+ libvirt-2-format:
+         c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         d: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-2-storage:
+ libvirt-3-format:
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-3-storage:
+ libvirt-4-format:
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-4-storage:
+ libvirt-5-format:
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-5-storage:
+diff --git a/tests/qemublocktestdata/bitmap/synthetic.out b/tests/qemublocktestdata/bitmap/synthetic.out
+index 45423903a0..2f4ae2b217 100644
+--- a/tests/qemublocktestdata/bitmap/synthetic.out
++++ b/tests/qemublocktestdata/bitmap/synthetic.out
+@@ -6,12 +6,17 @@ libvirt-1-format:
+  top-inactive: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+  top-transient: record:1 busy:0 persist:0 inconsist:0 gran:65536 dirty:0
+  top-transient-inactive: record:0 busy:0 persist:0 inconsist:0 gran:65536 dirty:0
++libvirt-1-storage:
+ libvirt-2-format:
+         d: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-2-storage:
+ libvirt-3-format:
+         b: record:1 busy:0 persist:0 inconsist:0 gran:65536 dirty:0
+         c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         d: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-3-storage:
+ libvirt-4-format:
++libvirt-4-storage:
+ libvirt-5-format:
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-5-storage:
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-qemucapabilitiestest-Add-data-for-the-qemu-10.0-dev-cycle-on-x86_64.patch b/SOURCES/libvirt-qemucapabilitiestest-Add-data-for-the-qemu-10.0-dev-cycle-on-x86_64.patch
deleted file mode 100644
index a42caa1..0000000
--- a/SOURCES/libvirt-qemucapabilitiestest-Add-data-for-the-qemu-10.0-dev-cycle-on-x86_64.patch
+++ /dev/null
@@ -1,54292 +0,0 @@
-From d056b57fff98c30ef64a695dec44a2ddfcc1c55b Mon Sep 17 00:00:00 2001
-Message-ID: <d056b57fff98c30ef64a695dec44a2ddfcc1c55b.1739824249.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 4 Feb 2025 17:12:00 +0100
-Subject: [PATCH] qemucapabilitiestest: Add data for the qemu-10.0 dev cycle on
- x86_64
-
-Add data based on 'v9.2.0-1537-gd922088eb4'
-
-Notable changes:
-    - '10.0' machine types added
-    - 'hub' chardev backend added
-    - 'cpr' migrate channel added
-    - 'nsamples' field for 'dbus' audio backend now reported
-    - 'ClearwaterForest-v1' cpu model added
-    - 'SierraForest-v2' cpu model added
-    - 'ivshmem-flat' device added
-    - new qom objects:
-        - 'virtio-mem-system-reset'
-        - 'vmclock'
-    - default value of 'rombar' changed from 1 to -1 for all devices
-    - 'intel-iommu' device:
-        - default value of 'aw-bit' changed from '39' to '48'
-        - 'fs1gp' boolean added
-        - 'x-flts' boolean added
-    - 'virtio-balloon-pci'/'virtio-mem-pci':
-        - 'ioeventfd' added
-        - 'vectors' added
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 712c39f987e1fb75a9fe3168dfb2501b719b5070)
-
-    Conflicts:
-        - 'migrate-incoming.exit-on-error' capability flag not backported
-        - 'ibpb-brtype' cpu feature not backported
-        - 'GraniteRapids-v2' cpu type not backported
-
-https://issues.redhat.com/browse/RHEL-79095
----
- .../domaincapsdata/qemu_10.0.0-q35.x86_64.xml |  1644 +
- .../domaincapsdata/qemu_10.0.0-tcg.x86_64.xml |  1763 +
- tests/domaincapsdata/qemu_10.0.0.x86_64.xml   |  1644 +
- .../caps_10.0.0_x86_64.replies                | 44998 ++++++++++++++++
- .../caps_10.0.0_x86_64.xml                    |  4159 ++
- 5 files changed, 54208 insertions(+)
- create mode 100644 tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
- create mode 100644 tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
- create mode 100644 tests/domaincapsdata/qemu_10.0.0.x86_64.xml
- create mode 100644 tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
- create mode 100644 tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-
-diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
-new file mode 100644
-index 0000000000..e4d8862569
---- /dev/null
-+++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
-@@ -0,0 +1,1644 @@
-+<domainCapabilities>
-+  <path>/usr/bin/qemu-system-x86_64</path>
-+  <domain>kvm</domain>
-+  <machine>pc-q35-10.0</machine>
-+  <arch>x86_64</arch>
-+  <vcpu max='4096'/>
-+  <iothreads supported='yes'/>
-+  <os supported='yes'>
-+    <enum name='firmware'>
-+      <value>bios</value>
-+      <value>efi</value>
-+    </enum>
-+    <loader supported='yes'>
-+      <value>/obviously/fake/firmware1.fd</value>
-+      <value>/obviously/fake/firmware2.fd</value>
-+      <enum name='type'>
-+        <value>rom</value>
-+        <value>pflash</value>
-+      </enum>
-+      <enum name='readonly'>
-+        <value>yes</value>
-+        <value>no</value>
-+      </enum>
-+      <enum name='secure'>
-+        <value>yes</value>
-+        <value>no</value>
-+      </enum>
-+    </loader>
-+  </os>
-+  <cpu>
-+    <mode name='host-passthrough' supported='yes'>
-+      <enum name='hostPassthroughMigratable'>
-+        <value>on</value>
-+        <value>off</value>
-+      </enum>
-+    </mode>
-+    <mode name='maximum' supported='yes'>
-+      <enum name='maximumMigratable'>
-+        <value>on</value>
-+        <value>off</value>
-+      </enum>
-+    </mode>
-+    <mode name='host-model' supported='yes'>
-+      <model fallback='forbid'>EPYC-Rome</model>
-+      <vendor>AMD</vendor>
-+      <maxphysaddr mode='passthrough' limit='64'/>
-+      <feature policy='require' name='x2apic'/>
-+      <feature policy='require' name='tsc-deadline'/>
-+      <feature policy='require' name='hypervisor'/>
-+      <feature policy='require' name='tsc_adjust'/>
-+      <feature policy='require' name='stibp'/>
-+      <feature policy='require' name='arch-capabilities'/>
-+      <feature policy='require' name='ssbd'/>
-+      <feature policy='require' name='cmp_legacy'/>
-+      <feature policy='require' name='overflow-recov'/>
-+      <feature policy='require' name='succor'/>
-+      <feature policy='require' name='invtsc'/>
-+      <feature policy='require' name='amd-ssbd'/>
-+      <feature policy='require' name='virt-ssbd'/>
-+      <feature policy='require' name='lbrv'/>
-+      <feature policy='require' name='tsc-scale'/>
-+      <feature policy='require' name='vmcb-clean'/>
-+      <feature policy='require' name='flushbyasid'/>
-+      <feature policy='require' name='pause-filter'/>
-+      <feature policy='require' name='pfthreshold'/>
-+      <feature policy='require' name='v-vmsave-vmload'/>
-+      <feature policy='require' name='vgif'/>
-+      <feature policy='require' name='svme-addr-chk'/>
-+      <feature policy='require' name='lfence-always-serializing'/>
-+      <feature policy='require' name='null-sel-clr-base'/>
-+      <feature policy='require' name='rdctl-no'/>
-+      <feature policy='require' name='skip-l1dfl-vmentry'/>
-+      <feature policy='require' name='mds-no'/>
-+      <feature policy='require' name='pschange-mc-no'/>
-+      <feature policy='require' name='gds-no'/>
-+      <feature policy='require' name='rfds-no'/>
-+      <feature policy='disable' name='xsaves'/>
-+    </mode>
-+    <mode name='custom' supported='yes'>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-+      <blockers model='Broadwell'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model>
-+      <blockers model='Broadwell-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model>
-+      <blockers model='Broadwell-noTSX'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model>
-+      <blockers model='Broadwell-noTSX-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
-+      <blockers model='Broadwell-v1'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
-+      <blockers model='Broadwell-v2'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
-+      <blockers model='Broadwell-v3'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
-+      <blockers model='Broadwell-v4'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
-+      <blockers model='Cascadelake-Server'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
-+      <blockers model='Cascadelake-Server-noTSX'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
-+      <blockers model='Cascadelake-Server-v1'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
-+      <blockers model='Cascadelake-Server-v2'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
-+      <blockers model='Cascadelake-Server-v3'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
-+      <blockers model='Cascadelake-Server-v4'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
-+      <blockers model='Cascadelake-Server-v5'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-+      <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-+      <blockers model='Cooperlake'>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
-+      <blockers model='Cooperlake-v1'>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cooperlake-v2</model>
-+      <blockers model='Cooperlake-v2'>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model>
-+      <blockers model='Denverton'>
-+        <feature name='erms'/>
-+        <feature name='mpx'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Denverton-v1</model>
-+      <blockers model='Denverton-v1'>
-+        <feature name='erms'/>
-+        <feature name='mpx'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Denverton-v2</model>
-+      <blockers model='Denverton-v2'>
-+        <feature name='erms'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Denverton-v3</model>
-+      <blockers model='Denverton-v3'>
-+        <feature name='erms'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model>
-+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
-+      <model usable='no' vendor='Hygon'>Dhyana-v2</model>
-+      <blockers model='Dhyana-v2'>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-+      <blockers model='EPYC-Genoa'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-+      <blockers model='EPYC-Milan'>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
-+      <blockers model='EPYC-Milan-v1'>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
-+      <blockers model='EPYC-Milan-v2'>
-+        <feature name='amd-psfd'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model>
-+      <blockers model='EPYC-Rome'>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
-+      <blockers model='EPYC-Rome-v1'>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
-+      <blockers model='EPYC-Rome-v2'>
-+        <feature name='ibrs'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
-+      <blockers model='EPYC-Rome-v3'>
-+        <feature name='ibrs'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
-+      <blockers model='EPYC-Rome-v4'>
-+        <feature name='ibrs'/>
-+      </blockers>
-+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
-+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
-+      <model usable='no' vendor='AMD'>EPYC-v3</model>
-+      <blockers model='EPYC-v3'>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-v4</model>
-+      <blockers model='EPYC-v4'>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model>
-+      <blockers model='GraniteRapids'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>GraniteRapids-v1</model>
-+      <blockers model='GraniteRapids-v1'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
-+      <blockers model='Haswell'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
-+      <blockers model='Haswell-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
-+      <blockers model='Haswell-noTSX'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
-+      <blockers model='Haswell-noTSX-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v1</model>
-+      <blockers model='Haswell-v1'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v2</model>
-+      <blockers model='Haswell-v2'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v3</model>
-+      <blockers model='Haswell-v3'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v4</model>
-+      <blockers model='Haswell-v4'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
-+      <blockers model='Icelake-Server'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model>
-+      <blockers model='Icelake-Server-noTSX'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
-+      <blockers model='Icelake-Server-v1'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
-+      <blockers model='Icelake-Server-v2'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
-+      <blockers model='Icelake-Server-v3'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
-+      <blockers model='Icelake-Server-v4'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
-+      <blockers model='Icelake-Server-v5'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
-+      <blockers model='Icelake-Server-v6'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v7</model>
-+      <blockers model='Icelake-Server-v7'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model>
-+      <blockers model='IvyBridge'>
-+        <feature name='erms'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model>
-+      <blockers model='IvyBridge-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
-+      <blockers model='IvyBridge-v1'>
-+        <feature name='erms'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
-+      <blockers model='IvyBridge-v2'>
-+        <feature name='erms'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-+      <blockers model='KnightsMill'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-+      <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-+      <blockers model='Nehalem-IBRS'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
-+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
-+      <blockers model='Nehalem-v2'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-+      <blockers model='Opteron_G4'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-+      <blockers model='Opteron_G5'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-+      <blockers model='SandyBridge-IBRS'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
-+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
-+      <blockers model='SandyBridge-v2'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
-+      <blockers model='SapphireRapids'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='erms'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
-+      <blockers model='SapphireRapids-v1'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='erms'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SapphireRapids-v2</model>
-+      <blockers model='SapphireRapids-v2'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SapphireRapids-v3</model>
-+      <blockers model='SapphireRapids-v3'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cldemote'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ss'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='SierraForest-v1'>SierraForest</model>
-+      <blockers model='SierraForest'>
-+        <feature name='avx-ifma'/>
-+        <feature name='avx-ne-convert'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx-vnni-int8'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cmpccxadd'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='psdp-no'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SierraForest-v1</model>
-+      <blockers model='SierraForest-v1'>
-+        <feature name='avx-ifma'/>
-+        <feature name='avx-ne-convert'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx-vnni-int8'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cmpccxadd'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='psdp-no'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
-+      <blockers model='Skylake-Client'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model>
-+      <blockers model='Skylake-Client-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model>
-+      <blockers model='Skylake-Client-noTSX-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
-+      <blockers model='Skylake-Client-v1'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
-+      <blockers model='Skylake-Client-v2'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
-+      <blockers model='Skylake-Client-v3'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
-+      <blockers model='Skylake-Client-v4'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model>
-+      <blockers model='Skylake-Server'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model>
-+      <blockers model='Skylake-Server-IBRS'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model>
-+      <blockers model='Skylake-Server-noTSX-IBRS'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
-+      <blockers model='Skylake-Server-v1'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
-+      <blockers model='Skylake-Server-v2'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
-+      <blockers model='Skylake-Server-v3'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
-+      <blockers model='Skylake-Server-v4'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
-+      <blockers model='Skylake-Server-v5'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model>
-+      <blockers model='Snowridge'>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='mpx'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
-+      <blockers model='Snowridge-v1'>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='mpx'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v2</model>
-+      <blockers model='Snowridge-v2'>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v3</model>
-+      <blockers model='Snowridge-v3'>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v4</model>
-+      <blockers model='Snowridge-v4'>
-+        <feature name='cldemote'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
-+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
-+      <blockers model='Westmere-IBRS'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
-+      <model usable='no' vendor='Intel'>Westmere-v2</model>
-+      <blockers model='Westmere-v2'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <blockers model='athlon'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <blockers model='core2duo'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <blockers model='coreduo'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <blockers model='n270'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-+      <blockers model='phenom'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-+    </mode>
-+  </cpu>
-+  <memoryBacking supported='yes'>
-+    <enum name='sourceType'>
-+      <value>file</value>
-+      <value>anonymous</value>
-+      <value>memfd</value>
-+    </enum>
-+  </memoryBacking>
-+  <devices>
-+    <disk supported='yes'>
-+      <enum name='diskDevice'>
-+        <value>disk</value>
-+        <value>cdrom</value>
-+        <value>floppy</value>
-+        <value>lun</value>
-+      </enum>
-+      <enum name='bus'>
-+        <value>fdc</value>
-+        <value>scsi</value>
-+        <value>virtio</value>
-+        <value>usb</value>
-+        <value>sata</value>
-+      </enum>
-+      <enum name='model'>
-+        <value>virtio</value>
-+        <value>virtio-transitional</value>
-+        <value>virtio-non-transitional</value>
-+      </enum>
-+    </disk>
-+    <graphics supported='yes'>
-+      <enum name='type'>
-+        <value>sdl</value>
-+        <value>vnc</value>
-+        <value>spice</value>
-+        <value>egl-headless</value>
-+        <value>dbus</value>
-+      </enum>
-+    </graphics>
-+    <video supported='yes'>
-+      <enum name='modelType'>
-+        <value>vga</value>
-+        <value>cirrus</value>
-+        <value>vmvga</value>
-+        <value>qxl</value>
-+        <value>virtio</value>
-+        <value>none</value>
-+        <value>bochs</value>
-+        <value>ramfb</value>
-+      </enum>
-+    </video>
-+    <hostdev supported='yes'>
-+      <enum name='mode'>
-+        <value>subsystem</value>
-+      </enum>
-+      <enum name='startupPolicy'>
-+        <value>default</value>
-+        <value>mandatory</value>
-+        <value>requisite</value>
-+        <value>optional</value>
-+      </enum>
-+      <enum name='subsysType'>
-+        <value>usb</value>
-+        <value>pci</value>
-+        <value>scsi</value>
-+      </enum>
-+      <enum name='capsType'/>
-+      <enum name='pciBackend'>
-+        <value>default</value>
-+        <value>vfio</value>
-+      </enum>
-+    </hostdev>
-+    <rng supported='yes'>
-+      <enum name='model'>
-+        <value>virtio</value>
-+        <value>virtio-transitional</value>
-+        <value>virtio-non-transitional</value>
-+      </enum>
-+      <enum name='backendModel'>
-+        <value>random</value>
-+        <value>egd</value>
-+        <value>builtin</value>
-+      </enum>
-+    </rng>
-+    <filesystem supported='yes'>
-+      <enum name='driverType'>
-+        <value>path</value>
-+        <value>handle</value>
-+        <value>virtiofs</value>
-+      </enum>
-+    </filesystem>
-+    <tpm supported='yes'>
-+      <enum name='model'>
-+        <value>tpm-tis</value>
-+        <value>tpm-crb</value>
-+      </enum>
-+      <enum name='backendModel'>
-+        <value>passthrough</value>
-+        <value>emulator</value>
-+        <value>external</value>
-+      </enum>
-+      <enum name='backendVersion'>
-+        <value>2.0</value>
-+      </enum>
-+    </tpm>
-+    <redirdev supported='yes'>
-+      <enum name='bus'>
-+        <value>usb</value>
-+      </enum>
-+    </redirdev>
-+    <channel supported='yes'>
-+      <enum name='type'>
-+        <value>pty</value>
-+        <value>unix</value>
-+        <value>spicevmc</value>
-+      </enum>
-+    </channel>
-+    <crypto supported='yes'>
-+      <enum name='model'>
-+        <value>virtio</value>
-+      </enum>
-+      <enum name='type'>
-+        <value>qemu</value>
-+      </enum>
-+      <enum name='backendModel'>
-+        <value>builtin</value>
-+        <value>lkcf</value>
-+      </enum>
-+    </crypto>
-+    <interface supported='yes'>
-+      <enum name='backendType'>
-+        <value>default</value>
-+        <value>passt</value>
-+      </enum>
-+    </interface>
-+    <panic supported='yes'>
-+      <enum name='model'>
-+        <value>isa</value>
-+        <value>hyperv</value>
-+        <value>pvpanic</value>
-+      </enum>
-+    </panic>
-+  </devices>
-+  <features>
-+    <gic supported='no'/>
-+    <vmcoreinfo supported='yes'/>
-+    <genid supported='yes'/>
-+    <backingStoreInput supported='yes'/>
-+    <backup supported='yes'/>
-+    <async-teardown supported='yes'/>
-+    <ps2 supported='yes'/>
-+    <sev supported='no'/>
-+    <sgx supported='no'/>
-+    <hyperv supported='yes'>
-+      <enum name='features'>
-+        <value>relaxed</value>
-+        <value>vapic</value>
-+        <value>spinlocks</value>
-+        <value>vpindex</value>
-+        <value>runtime</value>
-+        <value>synic</value>
-+        <value>stimer</value>
-+        <value>reset</value>
-+        <value>vendor_id</value>
-+        <value>frequencies</value>
-+        <value>reenlightenment</value>
-+        <value>tlbflush</value>
-+        <value>ipi</value>
-+        <value>avic</value>
-+        <value>emsr_bitmap</value>
-+        <value>xmm_input</value>
-+      </enum>
-+    </hyperv>
-+    <launchSecurity supported='no'/>
-+  </features>
-+</domainCapabilities>
-diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
-new file mode 100644
-index 0000000000..a21ed4997e
---- /dev/null
-+++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
-@@ -0,0 +1,1763 @@
-+<domainCapabilities>
-+  <path>/usr/bin/qemu-system-x86_64</path>
-+  <domain>qemu</domain>
-+  <machine>pc-i440fx-10.0</machine>
-+  <arch>x86_64</arch>
-+  <vcpu max='255'/>
-+  <iothreads supported='yes'/>
-+  <os supported='yes'>
-+    <enum name='firmware'>
-+      <value>bios</value>
-+      <value>efi</value>
-+    </enum>
-+    <loader supported='yes'>
-+      <value>/obviously/fake/firmware1.fd</value>
-+      <value>/obviously/fake/firmware2.fd</value>
-+      <enum name='type'>
-+        <value>rom</value>
-+        <value>pflash</value>
-+      </enum>
-+      <enum name='readonly'>
-+        <value>yes</value>
-+        <value>no</value>
-+      </enum>
-+      <enum name='secure'>
-+        <value>no</value>
-+      </enum>
-+    </loader>
-+  </os>
-+  <cpu>
-+    <mode name='host-passthrough' supported='no'/>
-+    <mode name='maximum' supported='yes'>
-+      <enum name='maximumMigratable'>
-+        <value>on</value>
-+        <value>off</value>
-+      </enum>
-+    </mode>
-+    <mode name='host-model' supported='yes'>
-+      <model fallback='forbid'>EPYC</model>
-+      <vendor>AMD</vendor>
-+      <feature policy='require' name='monitor'/>
-+      <feature policy='require' name='x2apic'/>
-+      <feature policy='require' name='hypervisor'/>
-+      <feature policy='require' name='acpi'/>
-+      <feature policy='require' name='ss'/>
-+      <feature policy='require' name='erms'/>
-+      <feature policy='require' name='mpx'/>
-+      <feature policy='require' name='clwb'/>
-+      <feature policy='require' name='umip'/>
-+      <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='cmpccxadd'/>
-+      <feature policy='require' name='fzrm'/>
-+      <feature policy='require' name='fsrs'/>
-+      <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='xsavec'/>
-+      <feature policy='disable' name='misalignsse'/>
-+      <feature policy='disable' name='osvw'/>
-+      <feature policy='disable' name='topoext'/>
-+      <feature policy='disable' name='fxsr_opt'/>
-+      <feature policy='disable' name='nrip-save'/>
-+    </mode>
-+    <mode name='custom' supported='yes'>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-+      <blockers model='Broadwell'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model>
-+      <blockers model='Broadwell-IBRS'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model>
-+      <blockers model='Broadwell-noTSX'>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model>
-+      <blockers model='Broadwell-noTSX-IBRS'>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
-+      <blockers model='Broadwell-v1'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
-+      <blockers model='Broadwell-v2'>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
-+      <blockers model='Broadwell-v3'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
-+      <blockers model='Broadwell-v4'>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
-+      <blockers model='Cascadelake-Server'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
-+      <blockers model='Cascadelake-Server-noTSX'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
-+      <blockers model='Cascadelake-Server-v1'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
-+      <blockers model='Cascadelake-Server-v2'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
-+      <blockers model='Cascadelake-Server-v3'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
-+      <blockers model='Cascadelake-Server-v4'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
-+      <blockers model='Cascadelake-Server-v5'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-+      <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-+      <blockers model='Cooperlake'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='stibp'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
-+      <blockers model='Cooperlake-v1'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='stibp'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cooperlake-v2</model>
-+      <blockers model='Cooperlake-v2'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='stibp'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model>
-+      <blockers model='Denverton'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Denverton-v1</model>
-+      <blockers model='Denverton-v1'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Denverton-v2</model>
-+      <blockers model='Denverton-v2'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Denverton-v3</model>
-+      <blockers model='Denverton-v3'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model>
-+      <blockers model='Dhyana'>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Hygon'>Dhyana-v1</model>
-+      <blockers model='Dhyana-v1'>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Hygon'>Dhyana-v2</model>
-+      <blockers model='Dhyana-v2'>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
-+      <blockers model='EPYC'>
-+        <feature name='fxsr_opt'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-+      <blockers model='EPYC-Genoa'>
-+        <feature name='amd-psfd'/>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='gfni'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='lfence-always-serializing'/>
-+        <feature name='misalignsse'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='nrip-save'/>
-+        <feature name='null-sel-clr-base'/>
-+        <feature name='osvw'/>
-+        <feature name='pcid'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='topoext'/>
-+        <feature name='vnmi'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='gfni'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='lfence-always-serializing'/>
-+        <feature name='misalignsse'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='nrip-save'/>
-+        <feature name='null-sel-clr-base'/>
-+        <feature name='osvw'/>
-+        <feature name='pcid'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='topoext'/>
-+        <feature name='vnmi'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-+      <blockers model='EPYC-IBPB'>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-+      <blockers model='EPYC-Milan'>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='pcid'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
-+      <blockers model='EPYC-Milan-v1'>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='pcid'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
-+      <blockers model='EPYC-Milan-v2'>
-+        <feature name='amd-psfd'/>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='lfence-always-serializing'/>
-+        <feature name='misalignsse'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='nrip-save'/>
-+        <feature name='null-sel-clr-base'/>
-+        <feature name='osvw'/>
-+        <feature name='pcid'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='topoext'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model>
-+      <blockers model='EPYC-Rome'>
-+        <feature name='amd-stibp'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
-+      <blockers model='EPYC-Rome-v1'>
-+        <feature name='amd-stibp'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
-+      <blockers model='EPYC-Rome-v2'>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
-+      <blockers model='EPYC-Rome-v3'>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
-+      <blockers model='EPYC-Rome-v4'>
-+        <feature name='amd-ssbd'/>
-+        <feature name='amd-stibp'/>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='ibrs'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-v1</model>
-+      <blockers model='EPYC-v1'>
-+        <feature name='fxsr_opt'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-v2</model>
-+      <blockers model='EPYC-v2'>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-v3</model>
-+      <blockers model='EPYC-v3'>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-v4</model>
-+      <blockers model='EPYC-v4'>
-+        <feature name='clzero'/>
-+        <feature name='fxsr_opt'/>
-+        <feature name='ibpb'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='osvw'/>
-+        <feature name='perfctr_core'/>
-+        <feature name='topoext'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model>
-+      <blockers model='GraniteRapids'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pcid'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>GraniteRapids-v1</model>
-+      <blockers model='GraniteRapids-v1'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pcid'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
-+      <blockers model='Haswell'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
-+      <blockers model='Haswell-IBRS'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
-+      <blockers model='Haswell-noTSX'>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
-+      <blockers model='Haswell-noTSX-IBRS'>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v1</model>
-+      <blockers model='Haswell-v1'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v2</model>
-+      <blockers model='Haswell-v2'>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v3</model>
-+      <blockers model='Haswell-v3'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v4</model>
-+      <blockers model='Haswell-v4'>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
-+      <blockers model='Icelake-Server'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model>
-+      <blockers model='Icelake-Server-noTSX'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
-+      <blockers model='Icelake-Server-v1'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
-+      <blockers model='Icelake-Server-v2'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
-+      <blockers model='Icelake-Server-v3'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
-+      <blockers model='Icelake-Server-v4'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
-+      <blockers model='Icelake-Server-v5'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
-+      <blockers model='Icelake-Server-v6'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v7</model>
-+      <blockers model='Icelake-Server-v7'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model>
-+      <blockers model='IvyBridge'>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model>
-+      <blockers model='IvyBridge-IBRS'>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
-+      <blockers model='IvyBridge-v1'>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
-+      <blockers model='IvyBridge-v2'>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-+      <blockers model='KnightsMill'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-+      <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-+      <blockers model='Nehalem-IBRS'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
-+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
-+      <blockers model='Nehalem-v2'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <blockers model='Opteron_G3'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
-+      <blockers model='Opteron_G3-v1'>
-+        <feature name='misalignsse'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-+      <blockers model='Opteron_G4'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-+      <blockers model='Opteron_G5'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='misalignsse'/>
-+        <feature name='nrip-save'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-+      <blockers model='SandyBridge'>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-+      <blockers model='SandyBridge-IBRS'>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
-+      <blockers model='SandyBridge-v1'>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
-+      <blockers model='SandyBridge-v2'>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
-+      <blockers model='SapphireRapids'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
-+      <blockers model='SapphireRapids-v1'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SapphireRapids-v2</model>
-+      <blockers model='SapphireRapids-v2'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SapphireRapids-v3</model>
-+      <blockers model='SapphireRapids-v3'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cldemote'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='tsc_adjust'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='SierraForest-v1'>SierraForest</model>
-+      <blockers model='SierraForest'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx-ifma'/>
-+        <feature name='avx-ne-convert'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx-vnni-int8'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pcid'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SierraForest-v1</model>
-+      <blockers model='SierraForest-v1'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='avx-ifma'/>
-+        <feature name='avx-ne-convert'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx-vnni-int8'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pcid'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
-+      <blockers model='Skylake-Client'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model>
-+      <blockers model='Skylake-Client-IBRS'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model>
-+      <blockers model='Skylake-Client-noTSX-IBRS'>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
-+      <blockers model='Skylake-Client-v1'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
-+      <blockers model='Skylake-Client-v2'>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
-+      <blockers model='Skylake-Client-v3'>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
-+      <blockers model='Skylake-Client-v4'>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model>
-+      <blockers model='Skylake-Server'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model>
-+      <blockers model='Skylake-Server-IBRS'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model>
-+      <blockers model='Skylake-Server-noTSX-IBRS'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
-+      <blockers model='Skylake-Server-v1'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
-+      <blockers model='Skylake-Server-v2'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
-+      <blockers model='Skylake-Server-v3'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
-+      <blockers model='Skylake-Server-v4'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
-+      <blockers model='Skylake-Server-v5'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model>
-+      <blockers model='Snowridge'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
-+      <blockers model='Snowridge-v1'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v2</model>
-+      <blockers model='Snowridge-v2'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v3</model>
-+      <blockers model='Snowridge-v3'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v4</model>
-+      <blockers model='Snowridge-v4'>
-+        <feature name='arch-capabilities'/>
-+        <feature name='cldemote'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ssbd'/>
-+        <feature name='tsc-deadline'/>
-+        <feature name='xsavec'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
-+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
-+      <blockers model='Westmere-IBRS'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
-+      <model usable='no' vendor='Intel'>Westmere-v2</model>
-+      <blockers model='Westmere-v2'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <model usable='yes' vendor='AMD'>athlon-v1</model>
-+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
-+      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <model usable='yes' vendor='Intel'>coreduo-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <model usable='yes' vendor='Intel'>n270-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-+      <blockers model='phenom'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='fxsr_opt'/>
-+      </blockers>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-+    </mode>
-+  </cpu>
-+  <memoryBacking supported='yes'>
-+    <enum name='sourceType'>
-+      <value>file</value>
-+      <value>anonymous</value>
-+      <value>memfd</value>
-+    </enum>
-+  </memoryBacking>
-+  <devices>
-+    <disk supported='yes'>
-+      <enum name='diskDevice'>
-+        <value>disk</value>
-+        <value>cdrom</value>
-+        <value>floppy</value>
-+        <value>lun</value>
-+      </enum>
-+      <enum name='bus'>
-+        <value>ide</value>
-+        <value>fdc</value>
-+        <value>scsi</value>
-+        <value>virtio</value>
-+        <value>usb</value>
-+        <value>sata</value>
-+      </enum>
-+      <enum name='model'>
-+        <value>virtio</value>
-+        <value>virtio-transitional</value>
-+        <value>virtio-non-transitional</value>
-+      </enum>
-+    </disk>
-+    <graphics supported='yes'>
-+      <enum name='type'>
-+        <value>sdl</value>
-+        <value>vnc</value>
-+        <value>spice</value>
-+        <value>egl-headless</value>
-+        <value>dbus</value>
-+      </enum>
-+    </graphics>
-+    <video supported='yes'>
-+      <enum name='modelType'>
-+        <value>vga</value>
-+        <value>cirrus</value>
-+        <value>vmvga</value>
-+        <value>qxl</value>
-+        <value>virtio</value>
-+        <value>none</value>
-+        <value>bochs</value>
-+        <value>ramfb</value>
-+      </enum>
-+    </video>
-+    <hostdev supported='yes'>
-+      <enum name='mode'>
-+        <value>subsystem</value>
-+      </enum>
-+      <enum name='startupPolicy'>
-+        <value>default</value>
-+        <value>mandatory</value>
-+        <value>requisite</value>
-+        <value>optional</value>
-+      </enum>
-+      <enum name='subsysType'>
-+        <value>usb</value>
-+        <value>pci</value>
-+        <value>scsi</value>
-+      </enum>
-+      <enum name='capsType'/>
-+      <enum name='pciBackend'>
-+        <value>default</value>
-+        <value>vfio</value>
-+      </enum>
-+    </hostdev>
-+    <rng supported='yes'>
-+      <enum name='model'>
-+        <value>virtio</value>
-+        <value>virtio-transitional</value>
-+        <value>virtio-non-transitional</value>
-+      </enum>
-+      <enum name='backendModel'>
-+        <value>random</value>
-+        <value>egd</value>
-+        <value>builtin</value>
-+      </enum>
-+    </rng>
-+    <filesystem supported='yes'>
-+      <enum name='driverType'>
-+        <value>path</value>
-+        <value>handle</value>
-+        <value>virtiofs</value>
-+      </enum>
-+    </filesystem>
-+    <tpm supported='yes'>
-+      <enum name='model'>
-+        <value>tpm-tis</value>
-+        <value>tpm-crb</value>
-+      </enum>
-+      <enum name='backendModel'>
-+        <value>passthrough</value>
-+        <value>emulator</value>
-+        <value>external</value>
-+      </enum>
-+      <enum name='backendVersion'>
-+        <value>2.0</value>
-+      </enum>
-+    </tpm>
-+    <redirdev supported='yes'>
-+      <enum name='bus'>
-+        <value>usb</value>
-+      </enum>
-+    </redirdev>
-+    <channel supported='yes'>
-+      <enum name='type'>
-+        <value>pty</value>
-+        <value>unix</value>
-+        <value>spicevmc</value>
-+      </enum>
-+    </channel>
-+    <crypto supported='yes'>
-+      <enum name='model'>
-+        <value>virtio</value>
-+      </enum>
-+      <enum name='type'>
-+        <value>qemu</value>
-+      </enum>
-+      <enum name='backendModel'>
-+        <value>builtin</value>
-+        <value>lkcf</value>
-+      </enum>
-+    </crypto>
-+    <interface supported='yes'>
-+      <enum name='backendType'>
-+        <value>default</value>
-+        <value>passt</value>
-+      </enum>
-+    </interface>
-+    <panic supported='yes'>
-+      <enum name='model'>
-+        <value>isa</value>
-+        <value>hyperv</value>
-+        <value>pvpanic</value>
-+      </enum>
-+    </panic>
-+  </devices>
-+  <features>
-+    <gic supported='no'/>
-+    <vmcoreinfo supported='yes'/>
-+    <genid supported='yes'/>
-+    <backingStoreInput supported='yes'/>
-+    <backup supported='yes'/>
-+    <async-teardown supported='yes'/>
-+    <ps2 supported='yes'/>
-+    <sev supported='no'/>
-+    <sgx supported='no'/>
-+    <hyperv supported='yes'>
-+      <enum name='features'>
-+        <value>relaxed</value>
-+        <value>vapic</value>
-+        <value>spinlocks</value>
-+        <value>vpindex</value>
-+        <value>runtime</value>
-+        <value>synic</value>
-+        <value>stimer</value>
-+        <value>reset</value>
-+        <value>vendor_id</value>
-+        <value>frequencies</value>
-+        <value>reenlightenment</value>
-+        <value>tlbflush</value>
-+        <value>ipi</value>
-+        <value>avic</value>
-+        <value>emsr_bitmap</value>
-+        <value>xmm_input</value>
-+      </enum>
-+    </hyperv>
-+    <launchSecurity supported='no'/>
-+  </features>
-+</domainCapabilities>
-diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
-new file mode 100644
-index 0000000000..f4989749ce
---- /dev/null
-+++ b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
-@@ -0,0 +1,1644 @@
-+<domainCapabilities>
-+  <path>/usr/bin/qemu-system-x86_64</path>
-+  <domain>kvm</domain>
-+  <machine>pc-i440fx-10.0</machine>
-+  <arch>x86_64</arch>
-+  <vcpu max='255'/>
-+  <iothreads supported='yes'/>
-+  <os supported='yes'>
-+    <enum name='firmware'>
-+      <value>bios</value>
-+      <value>efi</value>
-+    </enum>
-+    <loader supported='yes'>
-+      <value>/obviously/fake/firmware1.fd</value>
-+      <value>/obviously/fake/firmware2.fd</value>
-+      <enum name='type'>
-+        <value>rom</value>
-+        <value>pflash</value>
-+      </enum>
-+      <enum name='readonly'>
-+        <value>yes</value>
-+        <value>no</value>
-+      </enum>
-+      <enum name='secure'>
-+        <value>no</value>
-+      </enum>
-+    </loader>
-+  </os>
-+  <cpu>
-+    <mode name='host-passthrough' supported='yes'>
-+      <enum name='hostPassthroughMigratable'>
-+        <value>on</value>
-+        <value>off</value>
-+      </enum>
-+    </mode>
-+    <mode name='maximum' supported='yes'>
-+      <enum name='maximumMigratable'>
-+        <value>on</value>
-+        <value>off</value>
-+      </enum>
-+    </mode>
-+    <mode name='host-model' supported='yes'>
-+      <model fallback='forbid'>EPYC-Rome</model>
-+      <vendor>AMD</vendor>
-+      <maxphysaddr mode='passthrough' limit='64'/>
-+      <feature policy='require' name='x2apic'/>
-+      <feature policy='require' name='tsc-deadline'/>
-+      <feature policy='require' name='hypervisor'/>
-+      <feature policy='require' name='tsc_adjust'/>
-+      <feature policy='require' name='stibp'/>
-+      <feature policy='require' name='arch-capabilities'/>
-+      <feature policy='require' name='ssbd'/>
-+      <feature policy='require' name='cmp_legacy'/>
-+      <feature policy='require' name='overflow-recov'/>
-+      <feature policy='require' name='succor'/>
-+      <feature policy='require' name='invtsc'/>
-+      <feature policy='require' name='amd-ssbd'/>
-+      <feature policy='require' name='virt-ssbd'/>
-+      <feature policy='require' name='lbrv'/>
-+      <feature policy='require' name='tsc-scale'/>
-+      <feature policy='require' name='vmcb-clean'/>
-+      <feature policy='require' name='flushbyasid'/>
-+      <feature policy='require' name='pause-filter'/>
-+      <feature policy='require' name='pfthreshold'/>
-+      <feature policy='require' name='v-vmsave-vmload'/>
-+      <feature policy='require' name='vgif'/>
-+      <feature policy='require' name='svme-addr-chk'/>
-+      <feature policy='require' name='lfence-always-serializing'/>
-+      <feature policy='require' name='null-sel-clr-base'/>
-+      <feature policy='require' name='rdctl-no'/>
-+      <feature policy='require' name='skip-l1dfl-vmentry'/>
-+      <feature policy='require' name='mds-no'/>
-+      <feature policy='require' name='pschange-mc-no'/>
-+      <feature policy='require' name='gds-no'/>
-+      <feature policy='require' name='rfds-no'/>
-+      <feature policy='disable' name='xsaves'/>
-+    </mode>
-+    <mode name='custom' supported='yes'>
-+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
-+      <model usable='yes' vendor='unknown'>486-v1</model>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
-+      <blockers model='Broadwell'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model>
-+      <blockers model='Broadwell-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model>
-+      <blockers model='Broadwell-noTSX'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model>
-+      <blockers model='Broadwell-noTSX-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v1</model>
-+      <blockers model='Broadwell-v1'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v2</model>
-+      <blockers model='Broadwell-v2'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v3</model>
-+      <blockers model='Broadwell-v3'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Broadwell-v4</model>
-+      <blockers model='Broadwell-v4'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
-+      <blockers model='Cascadelake-Server'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
-+      <blockers model='Cascadelake-Server-noTSX'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
-+      <blockers model='Cascadelake-Server-v1'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
-+      <blockers model='Cascadelake-Server-v2'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
-+      <blockers model='Cascadelake-Server-v3'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
-+      <blockers model='Cascadelake-Server-v4'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
-+      <blockers model='Cascadelake-Server-v5'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
-+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
-+      <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
-+      <blockers model='Cooperlake'>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cooperlake-v1</model>
-+      <blockers model='Cooperlake-v1'>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Cooperlake-v2</model>
-+      <blockers model='Cooperlake-v2'>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model>
-+      <blockers model='Denverton'>
-+        <feature name='erms'/>
-+        <feature name='mpx'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Denverton-v1</model>
-+      <blockers model='Denverton-v1'>
-+        <feature name='erms'/>
-+        <feature name='mpx'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Denverton-v2</model>
-+      <blockers model='Denverton-v2'>
-+        <feature name='erms'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Denverton-v3</model>
-+      <blockers model='Denverton-v3'>
-+        <feature name='erms'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model>
-+      <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
-+      <model usable='no' vendor='Hygon'>Dhyana-v2</model>
-+      <blockers model='Dhyana-v2'>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
-+      <blockers model='EPYC-Genoa'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
-+      <blockers model='EPYC-Genoa-v1'>
-+        <feature name='amd-psfd'/>
-+        <feature name='auto-ibrs'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
-+      <blockers model='EPYC-Milan'>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
-+      <blockers model='EPYC-Milan-v1'>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
-+      <blockers model='EPYC-Milan-v2'>
-+        <feature name='amd-psfd'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='ibrs'/>
-+        <feature name='invpcid'/>
-+        <feature name='no-nested-data-bp'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='stibp-always-on'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model>
-+      <blockers model='EPYC-Rome'>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
-+      <blockers model='EPYC-Rome-v1'>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
-+      <blockers model='EPYC-Rome-v2'>
-+        <feature name='ibrs'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
-+      <blockers model='EPYC-Rome-v3'>
-+        <feature name='ibrs'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
-+      <blockers model='EPYC-Rome-v4'>
-+        <feature name='ibrs'/>
-+      </blockers>
-+      <model usable='yes' vendor='AMD'>EPYC-v1</model>
-+      <model usable='yes' vendor='AMD'>EPYC-v2</model>
-+      <model usable='no' vendor='AMD'>EPYC-v3</model>
-+      <blockers model='EPYC-v3'>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>EPYC-v4</model>
-+      <blockers model='EPYC-v4'>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model>
-+      <blockers model='GraniteRapids'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>GraniteRapids-v1</model>
-+      <blockers model='GraniteRapids-v1'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-fp16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='prefetchiti'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
-+      <blockers model='Haswell'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
-+      <blockers model='Haswell-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
-+      <blockers model='Haswell-noTSX'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
-+      <blockers model='Haswell-noTSX-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v1</model>
-+      <blockers model='Haswell-v1'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v2</model>
-+      <blockers model='Haswell-v2'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v3</model>
-+      <blockers model='Haswell-v3'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Haswell-v4</model>
-+      <blockers model='Haswell-v4'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
-+      <blockers model='Icelake-Server'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model>
-+      <blockers model='Icelake-Server-noTSX'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v1</model>
-+      <blockers model='Icelake-Server-v1'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v2</model>
-+      <blockers model='Icelake-Server-v2'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v3</model>
-+      <blockers model='Icelake-Server-v3'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v4</model>
-+      <blockers model='Icelake-Server-v4'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v5</model>
-+      <blockers model='Icelake-Server-v5'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v6</model>
-+      <blockers model='Icelake-Server-v6'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Icelake-Server-v7</model>
-+      <blockers model='Icelake-Server-v7'>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='erms'/>
-+        <feature name='fsrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model>
-+      <blockers model='IvyBridge'>
-+        <feature name='erms'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model>
-+      <blockers model='IvyBridge-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>IvyBridge-v1</model>
-+      <blockers model='IvyBridge-v1'>
-+        <feature name='erms'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>IvyBridge-v2</model>
-+      <blockers model='IvyBridge-v2'>
-+        <feature name='erms'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
-+      <blockers model='KnightsMill'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
-+      <blockers model='KnightsMill-v1'>
-+        <feature name='avx512-4fmaps'/>
-+        <feature name='avx512-4vnniw'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512er'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512pf'/>
-+        <feature name='erms'/>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
-+      <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
-+      <blockers model='Nehalem-IBRS'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel'>Nehalem-v1</model>
-+      <model usable='no' vendor='Intel'>Nehalem-v2</model>
-+      <blockers model='Nehalem-v2'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
-+      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
-+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
-+      <blockers model='Opteron_G4'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
-+      <blockers model='Opteron_G4-v1'>
-+        <feature name='fma4'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
-+      <blockers model='Opteron_G5'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
-+      <blockers model='Opteron_G5-v1'>
-+        <feature name='fma4'/>
-+        <feature name='tbm'/>
-+        <feature name='xop'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
-+      <model usable='yes' vendor='Intel'>Penryn-v1</model>
-+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
-+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
-+      <blockers model='SandyBridge-IBRS'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
-+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
-+      <blockers model='SandyBridge-v2'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
-+      <blockers model='SapphireRapids'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='erms'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SapphireRapids-v1</model>
-+      <blockers model='SapphireRapids-v1'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='erms'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SapphireRapids-v2</model>
-+      <blockers model='SapphireRapids-v2'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SapphireRapids-v3</model>
-+      <blockers model='SapphireRapids-v3'>
-+        <feature name='amx-bf16'/>
-+        <feature name='amx-int8'/>
-+        <feature name='amx-tile'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx512-bf16'/>
-+        <feature name='avx512-fp16'/>
-+        <feature name='avx512-vpopcntdq'/>
-+        <feature name='avx512bitalg'/>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512ifma'/>
-+        <feature name='avx512vbmi'/>
-+        <feature name='avx512vbmi2'/>
-+        <feature name='avx512vl'/>
-+        <feature name='avx512vnni'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cldemote'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrc'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='fzrm'/>
-+        <feature name='gfni'/>
-+        <feature name='hle'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='la57'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='psdp-no'/>
-+        <feature name='rtm'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='ss'/>
-+        <feature name='taa-no'/>
-+        <feature name='tsx-ldtrk'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xfd'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='SierraForest-v1'>SierraForest</model>
-+      <blockers model='SierraForest'>
-+        <feature name='avx-ifma'/>
-+        <feature name='avx-ne-convert'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx-vnni-int8'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cmpccxadd'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='psdp-no'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>SierraForest-v1</model>
-+      <blockers model='SierraForest-v1'>
-+        <feature name='avx-ifma'/>
-+        <feature name='avx-ne-convert'/>
-+        <feature name='avx-vnni'/>
-+        <feature name='avx-vnni-int8'/>
-+        <feature name='bus-lock-detect'/>
-+        <feature name='cmpccxadd'/>
-+        <feature name='erms'/>
-+        <feature name='fbsdp-no'/>
-+        <feature name='fsrm'/>
-+        <feature name='fsrs'/>
-+        <feature name='gfni'/>
-+        <feature name='ibrs-all'/>
-+        <feature name='invpcid'/>
-+        <feature name='mcdt-no'/>
-+        <feature name='pbrsb-no'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='psdp-no'/>
-+        <feature name='sbdr-ssdp-no'/>
-+        <feature name='serialize'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='vaes'/>
-+        <feature name='vpclmulqdq'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
-+      <blockers model='Skylake-Client'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model>
-+      <blockers model='Skylake-Client-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model>
-+      <blockers model='Skylake-Client-noTSX-IBRS'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v1</model>
-+      <blockers model='Skylake-Client-v1'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v2</model>
-+      <blockers model='Skylake-Client-v2'>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v3</model>
-+      <blockers model='Skylake-Client-v3'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Client-v4</model>
-+      <blockers model='Skylake-Client-v4'>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model>
-+      <blockers model='Skylake-Server'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model>
-+      <blockers model='Skylake-Server-IBRS'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model>
-+      <blockers model='Skylake-Server-noTSX-IBRS'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v1</model>
-+      <blockers model='Skylake-Server-v1'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v2</model>
-+      <blockers model='Skylake-Server-v2'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='hle'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='rtm'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v3</model>
-+      <blockers model='Skylake-Server-v3'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v4</model>
-+      <blockers model='Skylake-Server-v4'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Skylake-Server-v5</model>
-+      <blockers model='Skylake-Server-v5'>
-+        <feature name='avx512bw'/>
-+        <feature name='avx512cd'/>
-+        <feature name='avx512dq'/>
-+        <feature name='avx512f'/>
-+        <feature name='avx512vl'/>
-+        <feature name='erms'/>
-+        <feature name='invpcid'/>
-+        <feature name='pcid'/>
-+        <feature name='pku'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model>
-+      <blockers model='Snowridge'>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='mpx'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v1</model>
-+      <blockers model='Snowridge-v1'>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='mpx'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v2</model>
-+      <blockers model='Snowridge-v2'>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v3</model>
-+      <blockers model='Snowridge-v3'>
-+        <feature name='cldemote'/>
-+        <feature name='core-capability'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='split-lock-detect'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>Snowridge-v4</model>
-+      <blockers model='Snowridge-v4'>
-+        <feature name='cldemote'/>
-+        <feature name='erms'/>
-+        <feature name='gfni'/>
-+        <feature name='movdir64b'/>
-+        <feature name='movdiri'/>
-+        <feature name='spec-ctrl'/>
-+        <feature name='xsaves'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
-+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
-+      <blockers model='Westmere-IBRS'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
-+      <model usable='no' vendor='Intel'>Westmere-v2</model>
-+      <blockers model='Westmere-v2'>
-+        <feature name='spec-ctrl'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
-+      <blockers model='athlon'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>athlon-v1</model>
-+      <blockers model='athlon-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
-+      <blockers model='core2duo'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>core2duo-v1</model>
-+      <blockers model='core2duo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
-+      <blockers model='coreduo'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>coreduo-v1</model>
-+      <blockers model='coreduo-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
-+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
-+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
-+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
-+      <blockers model='n270'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='no' vendor='Intel'>n270-v1</model>
-+      <blockers model='n270-v1'>
-+        <feature name='ss'/>
-+      </blockers>
-+      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
-+      <model usable='yes' vendor='unknown'>pentium-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
-+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
-+      <model usable='yes' vendor='unknown'>pentium3-v1</model>
-+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
-+      <blockers model='phenom'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-+      <model usable='no' vendor='AMD'>phenom-v1</model>
-+      <blockers model='phenom-v1'>
-+        <feature name='3dnow'/>
-+        <feature name='3dnowext'/>
-+      </blockers>
-+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
-+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
-+      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
-+      <model usable='yes' vendor='unknown'>qemu64-v1</model>
-+    </mode>
-+  </cpu>
-+  <memoryBacking supported='yes'>
-+    <enum name='sourceType'>
-+      <value>file</value>
-+      <value>anonymous</value>
-+      <value>memfd</value>
-+    </enum>
-+  </memoryBacking>
-+  <devices>
-+    <disk supported='yes'>
-+      <enum name='diskDevice'>
-+        <value>disk</value>
-+        <value>cdrom</value>
-+        <value>floppy</value>
-+        <value>lun</value>
-+      </enum>
-+      <enum name='bus'>
-+        <value>ide</value>
-+        <value>fdc</value>
-+        <value>scsi</value>
-+        <value>virtio</value>
-+        <value>usb</value>
-+        <value>sata</value>
-+      </enum>
-+      <enum name='model'>
-+        <value>virtio</value>
-+        <value>virtio-transitional</value>
-+        <value>virtio-non-transitional</value>
-+      </enum>
-+    </disk>
-+    <graphics supported='yes'>
-+      <enum name='type'>
-+        <value>sdl</value>
-+        <value>vnc</value>
-+        <value>spice</value>
-+        <value>egl-headless</value>
-+        <value>dbus</value>
-+      </enum>
-+    </graphics>
-+    <video supported='yes'>
-+      <enum name='modelType'>
-+        <value>vga</value>
-+        <value>cirrus</value>
-+        <value>vmvga</value>
-+        <value>qxl</value>
-+        <value>virtio</value>
-+        <value>none</value>
-+        <value>bochs</value>
-+        <value>ramfb</value>
-+      </enum>
-+    </video>
-+    <hostdev supported='yes'>
-+      <enum name='mode'>
-+        <value>subsystem</value>
-+      </enum>
-+      <enum name='startupPolicy'>
-+        <value>default</value>
-+        <value>mandatory</value>
-+        <value>requisite</value>
-+        <value>optional</value>
-+      </enum>
-+      <enum name='subsysType'>
-+        <value>usb</value>
-+        <value>pci</value>
-+        <value>scsi</value>
-+      </enum>
-+      <enum name='capsType'/>
-+      <enum name='pciBackend'>
-+        <value>default</value>
-+        <value>vfio</value>
-+      </enum>
-+    </hostdev>
-+    <rng supported='yes'>
-+      <enum name='model'>
-+        <value>virtio</value>
-+        <value>virtio-transitional</value>
-+        <value>virtio-non-transitional</value>
-+      </enum>
-+      <enum name='backendModel'>
-+        <value>random</value>
-+        <value>egd</value>
-+        <value>builtin</value>
-+      </enum>
-+    </rng>
-+    <filesystem supported='yes'>
-+      <enum name='driverType'>
-+        <value>path</value>
-+        <value>handle</value>
-+        <value>virtiofs</value>
-+      </enum>
-+    </filesystem>
-+    <tpm supported='yes'>
-+      <enum name='model'>
-+        <value>tpm-tis</value>
-+        <value>tpm-crb</value>
-+      </enum>
-+      <enum name='backendModel'>
-+        <value>passthrough</value>
-+        <value>emulator</value>
-+        <value>external</value>
-+      </enum>
-+      <enum name='backendVersion'>
-+        <value>2.0</value>
-+      </enum>
-+    </tpm>
-+    <redirdev supported='yes'>
-+      <enum name='bus'>
-+        <value>usb</value>
-+      </enum>
-+    </redirdev>
-+    <channel supported='yes'>
-+      <enum name='type'>
-+        <value>pty</value>
-+        <value>unix</value>
-+        <value>spicevmc</value>
-+      </enum>
-+    </channel>
-+    <crypto supported='yes'>
-+      <enum name='model'>
-+        <value>virtio</value>
-+      </enum>
-+      <enum name='type'>
-+        <value>qemu</value>
-+      </enum>
-+      <enum name='backendModel'>
-+        <value>builtin</value>
-+        <value>lkcf</value>
-+      </enum>
-+    </crypto>
-+    <interface supported='yes'>
-+      <enum name='backendType'>
-+        <value>default</value>
-+        <value>passt</value>
-+      </enum>
-+    </interface>
-+    <panic supported='yes'>
-+      <enum name='model'>
-+        <value>isa</value>
-+        <value>hyperv</value>
-+        <value>pvpanic</value>
-+      </enum>
-+    </panic>
-+  </devices>
-+  <features>
-+    <gic supported='no'/>
-+    <vmcoreinfo supported='yes'/>
-+    <genid supported='yes'/>
-+    <backingStoreInput supported='yes'/>
-+    <backup supported='yes'/>
-+    <async-teardown supported='yes'/>
-+    <ps2 supported='yes'/>
-+    <sev supported='no'/>
-+    <sgx supported='no'/>
-+    <hyperv supported='yes'>
-+      <enum name='features'>
-+        <value>relaxed</value>
-+        <value>vapic</value>
-+        <value>spinlocks</value>
-+        <value>vpindex</value>
-+        <value>runtime</value>
-+        <value>synic</value>
-+        <value>stimer</value>
-+        <value>reset</value>
-+        <value>vendor_id</value>
-+        <value>frequencies</value>
-+        <value>reenlightenment</value>
-+        <value>tlbflush</value>
-+        <value>ipi</value>
-+        <value>avic</value>
-+        <value>emsr_bitmap</value>
-+        <value>xmm_input</value>
-+      </enum>
-+    </hyperv>
-+    <launchSecurity supported='no'/>
-+  </features>
-+</domainCapabilities>
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
-new file mode 100644
-index 0000000000..a0a20c0717
---- /dev/null
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
-@@ -0,0 +1,44998 @@
-+{
-+  "execute": "qmp_capabilities",
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "return": {},
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "execute": "query-version",
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "return": {
-+    "qemu": {
-+      "micro": 50,
-+      "minor": 2,
-+      "major": 9
-+    },
-+    "package": "v9.2.0-1537-gd922088eb4"
-+  },
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "execute": "query-target",
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "return": {
-+    "arch": "x86_64"
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "execute": "query-qmp-schema",
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "query-status",
-+      "ret-type": "1",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "SHUTDOWN",
-+      "meta-type": "event",
-+      "arg-type": "2"
-+    },
-+    {
-+      "name": "POWERDOWN",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "RESET",
-+      "meta-type": "event",
-+      "arg-type": "3"
-+    },
-+    {
-+      "name": "STOP",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "RESUME",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "SUSPEND",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "SUSPEND_DISK",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "WAKEUP",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "WATCHDOG",
-+      "meta-type": "event",
-+      "arg-type": "4"
-+    },
-+    {
-+      "name": "watchdog-set-action",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "5"
-+    },
-+    {
-+      "name": "set-action",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "6"
-+    },
-+    {
-+      "name": "GUEST_PANICKED",
-+      "meta-type": "event",
-+      "arg-type": "7"
-+    },
-+    {
-+      "name": "GUEST_CRASHLOADED",
-+      "meta-type": "event",
-+      "arg-type": "8"
-+    },
-+    {
-+      "name": "GUEST_PVSHUTDOWN",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "MEMORY_FAILURE",
-+      "meta-type": "event",
-+      "arg-type": "9"
-+    },
-+    {
-+      "name": "JOB_STATUS_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "10"
-+    },
-+    {
-+      "name": "job-pause",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "11"
-+    },
-+    {
-+      "name": "job-resume",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "12"
-+    },
-+    {
-+      "name": "job-cancel",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "13"
-+    },
-+    {
-+      "name": "job-complete",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "14"
-+    },
-+    {
-+      "name": "job-dismiss",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "15"
-+    },
-+    {
-+      "name": "job-finalize",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "16"
-+    },
-+    {
-+      "name": "query-jobs",
-+      "ret-type": "[17]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-pr-managers",
-+      "ret-type": "[18]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "eject",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "19"
-+    },
-+    {
-+      "name": "blockdev-open-tray",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "20"
-+    },
-+    {
-+      "name": "blockdev-close-tray",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "21"
-+    },
-+    {
-+      "name": "blockdev-remove-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "22"
-+    },
-+    {
-+      "name": "blockdev-insert-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "23"
-+    },
-+    {
-+      "name": "blockdev-change-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "24"
-+    },
-+    {
-+      "name": "DEVICE_TRAY_MOVED",
-+      "meta-type": "event",
-+      "arg-type": "25"
-+    },
-+    {
-+      "name": "PR_MANAGER_STATUS_CHANGED",
-+      "meta-type": "event",
-+      "arg-type": "26"
-+    },
-+    {
-+      "name": "block_set_io_throttle",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "27"
-+    },
-+    {
-+      "name": "block-latency-histogram-set",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "28"
-+    },
-+    {
-+      "name": "query-block",
-+      "ret-type": "[29]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-blockstats",
-+      "ret-type": "[31]",
-+      "meta-type": "command",
-+      "arg-type": "30"
-+    },
-+    {
-+      "name": "query-block-jobs",
-+      "ret-type": "[32]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "block_resize",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "33"
-+    },
-+    {
-+      "name": "blockdev-snapshot-sync",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "34"
-+    },
-+    {
-+      "name": "blockdev-snapshot",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "35",
-+      "features": [
-+        "allow-write-only-overlay"
-+      ]
-+    },
-+    {
-+      "name": "change-backing-file",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "36"
-+    },
-+    {
-+      "name": "block-commit",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "37"
-+    },
-+    {
-+      "name": "drive-backup",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "38",
-+      "features": [
-+        "deprecated"
-+      ]
-+    },
-+    {
-+      "name": "blockdev-backup",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "39"
-+    },
-+    {
-+      "name": "query-named-block-nodes",
-+      "ret-type": "[41]",
-+      "meta-type": "command",
-+      "arg-type": "40"
-+    },
-+    {
-+      "name": "x-debug-query-block-graph",
-+      "ret-type": "42",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "drive-mirror",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "43"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "44"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-remove",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "45"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-clear",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "45"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-enable",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "45"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-disable",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "45"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-merge",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "46"
-+    },
-+    {
-+      "name": "x-debug-block-dirty-bitmap-sha256",
-+      "ret-type": "47",
-+      "meta-type": "command",
-+      "arg-type": "45",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "blockdev-mirror",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "48"
-+    },
-+    {
-+      "name": "block-stream",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "49"
-+    },
-+    {
-+      "name": "block-job-set-speed",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "50"
-+    },
-+    {
-+      "name": "block-job-cancel",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "51"
-+    },
-+    {
-+      "name": "block-job-pause",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "52"
-+    },
-+    {
-+      "name": "block-job-resume",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "53"
-+    },
-+    {
-+      "name": "block-job-complete",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "54"
-+    },
-+    {
-+      "name": "block-job-dismiss",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "55"
-+    },
-+    {
-+      "name": "block-job-finalize",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "56"
-+    },
-+    {
-+      "name": "block-job-change",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "57"
-+    },
-+    {
-+      "name": "blockdev-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "58"
-+    },
-+    {
-+      "name": "blockdev-reopen",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "59"
-+    },
-+    {
-+      "name": "blockdev-del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "60"
-+    },
-+    {
-+      "name": "blockdev-create",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "61"
-+    },
-+    {
-+      "name": "x-blockdev-amend",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "62",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "BLOCK_IMAGE_CORRUPTED",
-+      "meta-type": "event",
-+      "arg-type": "63"
-+    },
-+    {
-+      "name": "BLOCK_IO_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "64"
-+    },
-+    {
-+      "name": "BLOCK_JOB_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "65"
-+    },
-+    {
-+      "name": "BLOCK_JOB_CANCELLED",
-+      "meta-type": "event",
-+      "arg-type": "66"
-+    },
-+    {
-+      "name": "BLOCK_JOB_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "67"
-+    },
-+    {
-+      "name": "BLOCK_JOB_READY",
-+      "meta-type": "event",
-+      "arg-type": "68"
-+    },
-+    {
-+      "name": "BLOCK_JOB_PENDING",
-+      "meta-type": "event",
-+      "arg-type": "69"
-+    },
-+    {
-+      "name": "BLOCK_WRITE_THRESHOLD",
-+      "meta-type": "event",
-+      "arg-type": "70"
-+    },
-+    {
-+      "name": "block-set-write-threshold",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "71"
-+    },
-+    {
-+      "name": "x-blockdev-change",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "72",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-blockdev-set-iothread",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "73",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "QUORUM_FAILURE",
-+      "meta-type": "event",
-+      "arg-type": "74"
-+    },
-+    {
-+      "name": "QUORUM_REPORT_BAD",
-+      "meta-type": "event",
-+      "arg-type": "75"
-+    },
-+    {
-+      "name": "blockdev-snapshot-internal-sync",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "76"
-+    },
-+    {
-+      "name": "blockdev-snapshot-delete-internal-sync",
-+      "ret-type": "78",
-+      "meta-type": "command",
-+      "arg-type": "77"
-+    },
-+    {
-+      "name": "nbd-server-start",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "79"
-+    },
-+    {
-+      "name": "nbd-server-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "80",
-+      "features": [
-+        "deprecated"
-+      ]
-+    },
-+    {
-+      "name": "nbd-server-remove",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "81",
-+      "features": [
-+        "deprecated"
-+      ]
-+    },
-+    {
-+      "name": "nbd-server-stop",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "block-export-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "82"
-+    },
-+    {
-+      "name": "block-export-del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "83"
-+    },
-+    {
-+      "name": "BLOCK_EXPORT_DELETED",
-+      "meta-type": "event",
-+      "arg-type": "84"
-+    },
-+    {
-+      "name": "query-block-exports",
-+      "ret-type": "[85]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-chardev",
-+      "ret-type": "[86]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-chardev-backends",
-+      "ret-type": "[87]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "ringbuf-write",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "88"
-+    },
-+    {
-+      "name": "ringbuf-read",
-+      "ret-type": "str",
-+      "meta-type": "command",
-+      "arg-type": "89"
-+    },
-+    {
-+      "name": "chardev-add",
-+      "ret-type": "91",
-+      "meta-type": "command",
-+      "arg-type": "90"
-+    },
-+    {
-+      "name": "chardev-change",
-+      "ret-type": "91",
-+      "meta-type": "command",
-+      "arg-type": "92"
-+    },
-+    {
-+      "name": "chardev-remove",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "93"
-+    },
-+    {
-+      "name": "chardev-send-break",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "94"
-+    },
-+    {
-+      "name": "VSERPORT_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "95"
-+    },
-+    {
-+      "name": "dump-guest-memory",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "96"
-+    },
-+    {
-+      "name": "query-dump",
-+      "ret-type": "97",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "DUMP_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "98"
-+    },
-+    {
-+      "name": "query-dump-guest-memory-capability",
-+      "ret-type": "99",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "set_link",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "100"
-+    },
-+    {
-+      "name": "netdev_add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "101"
-+    },
-+    {
-+      "name": "netdev_del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "102"
-+    },
-+    {
-+      "name": "query-rx-filter",
-+      "ret-type": "[104]",
-+      "meta-type": "command",
-+      "arg-type": "103"
-+    },
-+    {
-+      "name": "NIC_RX_FILTER_CHANGED",
-+      "meta-type": "event",
-+      "arg-type": "105"
-+    },
-+    {
-+      "name": "announce-self",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "106"
-+    },
-+    {
-+      "name": "FAILOVER_NEGOTIATED",
-+      "meta-type": "event",
-+      "arg-type": "107"
-+    },
-+    {
-+      "name": "NETDEV_STREAM_CONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "108"
-+    },
-+    {
-+      "name": "NETDEV_STREAM_DISCONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "109"
-+    },
-+    {
-+      "name": "request-ebpf",
-+      "ret-type": "111",
-+      "meta-type": "command",
-+      "arg-type": "110"
-+    },
-+    {
-+      "name": "query-rocker",
-+      "ret-type": "113",
-+      "meta-type": "command",
-+      "arg-type": "112"
-+    },
-+    {
-+      "name": "query-rocker-ports",
-+      "ret-type": "[115]",
-+      "meta-type": "command",
-+      "arg-type": "114"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-flows",
-+      "ret-type": "[117]",
-+      "meta-type": "command",
-+      "arg-type": "116"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-groups",
-+      "ret-type": "[119]",
-+      "meta-type": "command",
-+      "arg-type": "118"
-+    },
-+    {
-+      "name": "query-tpm-models",
-+      "ret-type": "[120]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-tpm-types",
-+      "ret-type": "[121]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-tpm",
-+      "ret-type": "[122]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "set_password",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "123"
-+    },
-+    {
-+      "name": "expire_password",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "124"
-+    },
-+    {
-+      "name": "screendump",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "125"
-+    },
-+    {
-+      "name": "query-spice",
-+      "ret-type": "126",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "SPICE_CONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "127"
-+    },
-+    {
-+      "name": "SPICE_INITIALIZED",
-+      "meta-type": "event",
-+      "arg-type": "128"
-+    },
-+    {
-+      "name": "SPICE_DISCONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "129"
-+    },
-+    {
-+      "name": "SPICE_MIGRATE_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-vnc",
-+      "ret-type": "130",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-vnc-servers",
-+      "ret-type": "[131]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "change-vnc-password",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "132"
-+    },
-+    {
-+      "name": "VNC_CONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "133"
-+    },
-+    {
-+      "name": "VNC_INITIALIZED",
-+      "meta-type": "event",
-+      "arg-type": "134"
-+    },
-+    {
-+      "name": "VNC_DISCONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "135"
-+    },
-+    {
-+      "name": "query-mice",
-+      "ret-type": "[136]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "send-key",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "137"
-+    },
-+    {
-+      "name": "input-send-event",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "138"
-+    },
-+    {
-+      "name": "query-display-options",
-+      "ret-type": "139",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "display-reload",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "140"
-+    },
-+    {
-+      "name": "display-update",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "141"
-+    },
-+    {
-+      "name": "client_migrate_info",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "142"
-+    },
-+    {
-+      "name": "query-migrate",
-+      "ret-type": "143",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-set-capabilities",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "144"
-+    },
-+    {
-+      "name": "query-migrate-capabilities",
-+      "ret-type": "[145]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-set-parameters",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "146"
-+    },
-+    {
-+      "name": "query-migrate-parameters",
-+      "ret-type": "147",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-start-postcopy",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "MIGRATION",
-+      "meta-type": "event",
-+      "arg-type": "148"
-+    },
-+    {
-+      "name": "MIGRATION_PASS",
-+      "meta-type": "event",
-+      "arg-type": "149"
-+    },
-+    {
-+      "name": "COLO_EXIT",
-+      "meta-type": "event",
-+      "arg-type": "150"
-+    },
-+    {
-+      "name": "x-colo-lost-heartbeat",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "migrate_cancel",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-continue",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "151"
-+    },
-+    {
-+      "name": "migrate",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "152"
-+    },
-+    {
-+      "name": "migrate-incoming",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "153"
-+    },
-+    {
-+      "name": "xen-save-devices-state",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "154"
-+    },
-+    {
-+      "name": "xen-set-global-dirty-log",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "155"
-+    },
-+    {
-+      "name": "xen-load-devices-state",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "156"
-+    },
-+    {
-+      "name": "xen-set-replication",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "157"
-+    },
-+    {
-+      "name": "query-xen-replication-status",
-+      "ret-type": "158",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "xen-colo-do-checkpoint",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-colo-status",
-+      "ret-type": "159",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-recover",
-+      "ret-type": "0",
-+      "allow-oob": true,
-+      "meta-type": "command",
-+      "arg-type": "160"
-+    },
-+    {
-+      "name": "migrate-pause",
-+      "ret-type": "0",
-+      "allow-oob": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "UNPLUG_PRIMARY",
-+      "meta-type": "event",
-+      "arg-type": "161"
-+    },
-+    {
-+      "name": "calc-dirty-rate",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "162"
-+    },
-+    {
-+      "name": "query-dirty-rate",
-+      "ret-type": "164",
-+      "meta-type": "command",
-+      "arg-type": "163"
-+    },
-+    {
-+      "name": "set-vcpu-dirty-limit",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "165"
-+    },
-+    {
-+      "name": "cancel-vcpu-dirty-limit",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "166"
-+    },
-+    {
-+      "name": "query-vcpu-dirty-limit",
-+      "ret-type": "[167]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-migrationthreads",
-+      "ret-type": "[168]",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "deprecated"
-+      ]
-+    },
-+    {
-+      "name": "snapshot-save",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "169"
-+    },
-+    {
-+      "name": "snapshot-load",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "170"
-+    },
-+    {
-+      "name": "snapshot-delete",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "171"
-+    },
-+    {
-+      "name": "transaction",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "172"
-+    },
-+    {
-+      "name": "trace-event-get-state",
-+      "ret-type": "[174]",
-+      "meta-type": "command",
-+      "arg-type": "173"
-+    },
-+    {
-+      "name": "trace-event-set-state",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "175"
-+    },
-+    {
-+      "name": "qmp_capabilities",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "176"
-+    },
-+    {
-+      "name": "query-version",
-+      "ret-type": "177",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-commands",
-+      "ret-type": "[178]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "quit",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-qmp-schema",
-+      "ret-type": "[179]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "qom-list",
-+      "ret-type": "[181]",
-+      "meta-type": "command",
-+      "arg-type": "180"
-+    },
-+    {
-+      "name": "qom-get",
-+      "ret-type": "any",
-+      "meta-type": "command",
-+      "arg-type": "182"
-+    },
-+    {
-+      "name": "qom-set",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "183"
-+    },
-+    {
-+      "name": "qom-list-types",
-+      "ret-type": "[185]",
-+      "meta-type": "command",
-+      "arg-type": "184"
-+    },
-+    {
-+      "name": "qom-list-properties",
-+      "ret-type": "[181]",
-+      "meta-type": "command",
-+      "arg-type": "186"
-+    },
-+    {
-+      "name": "object-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "187"
-+    },
-+    {
-+      "name": "object-del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "188"
-+    },
-+    {
-+      "name": "device-list-properties",
-+      "ret-type": "[181]",
-+      "meta-type": "command",
-+      "arg-type": "189"
-+    },
-+    {
-+      "name": "device_add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "190",
-+      "features": [
-+        "json-cli",
-+        "json-cli-hotplug"
-+      ]
-+    },
-+    {
-+      "name": "device_del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "191"
-+    },
-+    {
-+      "name": "DEVICE_DELETED",
-+      "meta-type": "event",
-+      "arg-type": "192"
-+    },
-+    {
-+      "name": "DEVICE_UNPLUG_GUEST_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "193"
-+    },
-+    {
-+      "name": "device-sync-config",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "194",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "query-cpus-fast",
-+      "ret-type": "[195]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-machines",
-+      "ret-type": "[197]",
-+      "meta-type": "command",
-+      "arg-type": "196"
-+    },
-+    {
-+      "name": "query-current-machine",
-+      "ret-type": "198",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-target",
-+      "ret-type": "199",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-uuid",
-+      "ret-type": "200",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-vm-generation-id",
-+      "ret-type": "201",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "system_reset",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "system_powerdown",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "system_wakeup",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "inject-nmi",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-kvm",
-+      "ret-type": "202",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "memsave",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "203"
-+    },
-+    {
-+      "name": "pmemsave",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "204"
-+    },
-+    {
-+      "name": "query-memdev",
-+      "ret-type": "[205]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-hotpluggable-cpus",
-+      "ret-type": "[206]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "set-numa-node",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "207"
-+    },
-+    {
-+      "name": "balloon",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "208"
-+    },
-+    {
-+      "name": "query-balloon",
-+      "ret-type": "209",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "BALLOON_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "210"
-+    },
-+    {
-+      "name": "query-hv-balloon-status-report",
-+      "ret-type": "211",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "HV_BALLOON_STATUS_REPORT",
-+      "meta-type": "event",
-+      "arg-type": "211"
-+    },
-+    {
-+      "name": "query-memory-size-summary",
-+      "ret-type": "212",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-memory-devices",
-+      "ret-type": "[213]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "MEMORY_DEVICE_SIZE_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "214"
-+    },
-+    {
-+      "name": "x-query-irq",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-jit",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-numa",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-opcount",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-ramblock",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-roms",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-usb",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "dumpdtb",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "216"
-+    },
-+    {
-+      "name": "x-query-interrupt-controllers",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "query-cpu-model-expansion",
-+      "ret-type": "222",
-+      "meta-type": "command",
-+      "arg-type": "221"
-+    },
-+    {
-+      "name": "query-cpu-definitions",
-+      "ret-type": "[223]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-replay",
-+      "ret-type": "227",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "replay-break",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "228"
-+    },
-+    {
-+      "name": "replay-delete-break",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "replay-seek",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "229"
-+    },
-+    {
-+      "name": "yank",
-+      "ret-type": "0",
-+      "allow-oob": true,
-+      "meta-type": "command",
-+      "arg-type": "230"
-+    },
-+    {
-+      "name": "query-yank",
-+      "ret-type": "[231]",
-+      "allow-oob": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "add_client",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "232"
-+    },
-+    {
-+      "name": "query-name",
-+      "ret-type": "233",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-iothreads",
-+      "ret-type": "[234]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "stop",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "cont",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "x-exit-preconfig",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "human-monitor-command",
-+      "ret-type": "str",
-+      "meta-type": "command",
-+      "arg-type": "235",
-+      "features": [
-+        "savevm-monitor-nodes"
-+      ]
-+    },
-+    {
-+      "name": "getfd",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "236"
-+    },
-+    {
-+      "name": "closefd",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "238"
-+    },
-+    {
-+      "name": "add-fd",
-+      "ret-type": "240",
-+      "meta-type": "command",
-+      "arg-type": "239"
-+    },
-+    {
-+      "name": "remove-fd",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "241"
-+    },
-+    {
-+      "name": "query-fdsets",
-+      "ret-type": "[242]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-command-line-options",
-+      "ret-type": "[244]",
-+      "meta-type": "command",
-+      "arg-type": "243"
-+    },
-+    {
-+      "name": "RTC_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "245"
-+    },
-+    {
-+      "name": "VFU_CLIENT_HANGUP",
-+      "meta-type": "event",
-+      "arg-type": "246"
-+    },
-+    {
-+      "name": "rtc-reset-reinjection",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-sev",
-+      "ret-type": "247",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-sev-launch-measure",
-+      "ret-type": "248",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-sev-capabilities",
-+      "ret-type": "249",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "sev-inject-launch-secret",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "250"
-+    },
-+    {
-+      "name": "query-sev-attestation-report",
-+      "ret-type": "252",
-+      "meta-type": "command",
-+      "arg-type": "251"
-+    },
-+    {
-+      "name": "query-sgx",
-+      "ret-type": "255",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-sgx-capabilities",
-+      "ret-type": "255",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "xen-event-list",
-+      "ret-type": "[256]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "xen-event-inject",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "257"
-+    },
-+    {
-+      "name": "query-audiodevs",
-+      "ret-type": "[258]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-acpi-ospm-status",
-+      "ret-type": "[259]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "ACPI_DEVICE_OST",
-+      "meta-type": "event",
-+      "arg-type": "260"
-+    },
-+    {
-+      "name": "query-pci",
-+      "ret-type": "[261]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-stats",
-+      "ret-type": "[263]",
-+      "meta-type": "command",
-+      "arg-type": "262"
-+    },
-+    {
-+      "name": "query-stats-schemas",
-+      "ret-type": "[265]",
-+      "meta-type": "command",
-+      "arg-type": "264"
-+    },
-+    {
-+      "name": "x-query-virtio",
-+      "ret-type": "[266]",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-virtio-status",
-+      "ret-type": "268",
-+      "meta-type": "command",
-+      "arg-type": "267",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-virtio-queue-status",
-+      "ret-type": "270",
-+      "meta-type": "command",
-+      "arg-type": "269",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-virtio-vhost-queue-status",
-+      "ret-type": "272",
-+      "meta-type": "command",
-+      "arg-type": "271",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-virtio-queue-element",
-+      "ret-type": "274",
-+      "meta-type": "command",
-+      "arg-type": "273",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "VFIO_MIGRATION",
-+      "meta-type": "event",
-+      "arg-type": "275"
-+    },
-+    {
-+      "name": "query-cryptodev",
-+      "ret-type": "[276]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "cxl-inject-general-media-event",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "277"
-+    },
-+    {
-+      "name": "cxl-inject-dram-event",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "278"
-+    },
-+    {
-+      "name": "cxl-inject-memory-module-event",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "279"
-+    },
-+    {
-+      "name": "cxl-inject-poison",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "280"
-+    },
-+    {
-+      "name": "cxl-inject-uncorrectable-errors",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "281"
-+    },
-+    {
-+      "name": "cxl-inject-correctable-error",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "282"
-+    },
-+    {
-+      "name": "cxl-add-dynamic-capacity",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "283",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "cxl-release-dynamic-capacity",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "284",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "0",
-+      "members": [],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "1",
-+      "members": [
-+        {
-+          "name": "running",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "status",
-+          "type": "285"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "2",
-+      "members": [
-+        {
-+          "name": "guest",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "286"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "3",
-+      "members": [
-+        {
-+          "name": "guest",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "286"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "4",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "287"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "5",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "287"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "6",
-+      "members": [
-+        {
-+          "name": "reboot",
-+          "default": null,
-+          "type": "288"
-+        },
-+        {
-+          "name": "shutdown",
-+          "default": null,
-+          "type": "289"
-+        },
-+        {
-+          "name": "panic",
-+          "default": null,
-+          "type": "290"
-+        },
-+        {
-+          "name": "watchdog",
-+          "default": null,
-+          "type": "287"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "7",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "291"
-+        },
-+        {
-+          "name": "info",
-+          "default": null,
-+          "type": "292"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "8",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "291"
-+        },
-+        {
-+          "name": "info",
-+          "default": null,
-+          "type": "292"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "9",
-+      "members": [
-+        {
-+          "name": "recipient",
-+          "type": "293"
-+        },
-+        {
-+          "name": "action",
-+          "type": "294"
-+        },
-+        {
-+          "name": "flags",
-+          "type": "295"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "10",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "status",
-+          "type": "296"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "11",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "12",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "13",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "14",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "15",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "16",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[17]",
-+      "element-type": "17",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "17",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "status",
-+          "type": "296"
-+        },
-+        {
-+          "name": "current-progress",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total-progress",
-+          "type": "int"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[18]",
-+      "element-type": "18",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "18",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "19",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "20",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "21",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "22",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "23",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "24",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "read-only-mode",
-+          "default": null,
-+          "type": "298"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "25",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tray-open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "26",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "27",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "bps",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "28",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "boundaries",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "boundaries-read",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "boundaries-write",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "boundaries-zap",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "boundaries-flush",
-+          "default": null,
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[29]",
-+      "element-type": "29",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "29",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "qdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "removable",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "locked",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "inserted",
-+          "default": null,
-+          "type": "41"
-+        },
-+        {
-+          "name": "tray_open",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "io-status",
-+          "default": null,
-+          "type": "299"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "30",
-+      "members": [
-+        {
-+          "name": "query-nodes",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[31]",
-+      "element-type": "31",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "31",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "qdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "stats",
-+          "type": "300"
-+        },
-+        {
-+          "name": "driver-specific",
-+          "default": null,
-+          "type": "301"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "31"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "31"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[32]",
-+      "element-type": "32",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "32",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "mirror",
-+          "type": "302"
-+        },
-+        {
-+          "case": "commit",
-+          "type": "0"
-+        },
-+        {
-+          "case": "stream",
-+          "type": "0"
-+        },
-+        {
-+          "case": "backup",
-+          "type": "0"
-+        },
-+        {
-+          "case": "create",
-+          "type": "0"
-+        },
-+        {
-+          "case": "amend",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-load",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-save",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-delete",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "busy",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "paused",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "io-status",
-+          "type": "299"
-+        },
-+        {
-+          "name": "ready",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "status",
-+          "type": "296"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "33",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "34",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "snapshot-file",
-+          "type": "str"
-+        },
-+        {
-+          "name": "snapshot-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "303"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "35",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "overlay",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "36",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "image-node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-file",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "37",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "base-node",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "base",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "top-node",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "top",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-mask-protocol",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "on-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "38",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "305"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmap-mode",
-+          "default": null,
-+          "type": "306"
-+        },
-+        {
-+          "name": "compress",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "discard-source",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-perf",
-+          "default": null,
-+          "type": "307",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "303"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "39",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "305"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmap-mode",
-+          "default": null,
-+          "type": "306"
-+        },
-+        {
-+          "name": "compress",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "discard-source",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-perf",
-+          "default": null,
-+          "type": "307",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "40",
-+      "members": [
-+        {
-+          "name": "flat",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[41]",
-+      "element-type": "41",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "41",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ro",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "drv",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing_file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing_file_depth",
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypted",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "detect_zeroes",
-+          "type": "308"
-+        },
-+        {
-+          "name": "bps",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "image",
-+          "type": "309"
-+        },
-+        {
-+          "name": "bps_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cache",
-+          "type": "310"
-+        },
-+        {
-+          "name": "write_threshold",
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-bitmaps",
-+          "default": null,
-+          "type": "[311]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "42",
-+      "members": [
-+        {
-+          "name": "nodes",
-+          "type": "[312]"
-+        },
-+        {
-+          "name": "edges",
-+          "type": "[313]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "43",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "replaces",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "305"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "303"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "granularity",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "buf-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "unmap",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "copy-mode",
-+          "default": null,
-+          "type": "314"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "44",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "granularity",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "persistent",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "disabled",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "45",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "46",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmaps",
-+          "type": "[315]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "47",
-+      "members": [
-+        {
-+          "name": "sha256",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "48",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "replaces",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "305"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "granularity",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "buf-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "copy-mode",
-+          "default": null,
-+          "type": "314"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "49",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "base",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "base-node",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-mask-protocol",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "bottom",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "on-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "50",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "51",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "52",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "53",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "54",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "55",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "56",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "57",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "mirror",
-+          "type": "316"
-+        },
-+        {
-+          "case": "commit",
-+          "type": "0"
-+        },
-+        {
-+          "case": "stream",
-+          "type": "0"
-+        },
-+        {
-+          "case": "backup",
-+          "type": "0"
-+        },
-+        {
-+          "case": "create",
-+          "type": "0"
-+        },
-+        {
-+          "case": "amend",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-load",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-save",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-delete",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "297"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "58",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "blkdebug",
-+          "type": "320"
-+        },
-+        {
-+          "case": "blklogwrites",
-+          "type": "321"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "322"
-+        },
-+        {
-+          "case": "blkreplay",
-+          "type": "323"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "324"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "324"
-+        },
-+        {
-+          "case": "compress",
-+          "type": "324"
-+        },
-+        {
-+          "case": "copy-before-write",
-+          "type": "325"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "326"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "324"
-+        },
-+        {
-+          "case": "file",
-+          "type": "327"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "328"
-+        },
-+        {
-+          "case": "ftps",
-+          "type": "329"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "330"
-+        },
-+        {
-+          "case": "host_cdrom",
-+          "type": "327"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "327"
-+        },
-+        {
-+          "case": "http",
-+          "type": "331"
-+        },
-+        {
-+          "case": "https",
-+          "type": "332"
-+        },
-+        {
-+          "case": "io_uring",
-+          "type": "333"
-+        },
-+        {
-+          "case": "iscsi",
-+          "type": "334"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "335"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "336"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "337"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "338"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "338"
-+        },
-+        {
-+          "case": "nvme",
-+          "type": "339"
-+        },
-+        {
-+          "case": "nvme-io_uring",
-+          "type": "340"
-+        },
-+        {
-+          "case": "parallels",
-+          "type": "324"
-+        },
-+        {
-+          "case": "preallocate",
-+          "type": "341"
-+        },
-+        {
-+          "case": "qcow2",
-+          "type": "342"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "343"
-+        },
-+        {
-+          "case": "qed",
-+          "type": "344"
-+        },
-+        {
-+          "case": "quorum",
-+          "type": "345"
-+        },
-+        {
-+          "case": "raw",
-+          "type": "346"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "347"
-+        },
-+        {
-+          "case": "replication",
-+          "type": "348"
-+        },
-+        {
-+          "case": "snapshot-access",
-+          "type": "324"
-+        },
-+        {
-+          "case": "ssh",
-+          "type": "349"
-+        },
-+        {
-+          "case": "throttle",
-+          "type": "350"
-+        },
-+        {
-+          "case": "vdi",
-+          "type": "324"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "324"
-+        },
-+        {
-+          "case": "virtio-blk-vfio-pci",
-+          "type": "351"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-user",
-+          "type": "352"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-vdpa",
-+          "type": "353"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "344"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "324"
-+        },
-+        {
-+          "case": "vvfat",
-+          "type": "354"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "317"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "discard",
-+          "default": null,
-+          "type": "318"
-+        },
-+        {
-+          "name": "cache",
-+          "default": null,
-+          "type": "319"
-+        },
-+        {
-+          "name": "read-only",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-read-only",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "force-share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "detect-zeroes",
-+          "default": null,
-+          "type": "308"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "59",
-+      "members": [
-+        {
-+          "name": "options",
-+          "type": "[58]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "60",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "61",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "options",
-+          "type": "355"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "62",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "options",
-+          "type": "356"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "63",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "msg",
-+          "type": "str"
-+        },
-+        {
-+          "name": "offset",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "fatal",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "64",
-+      "members": [
-+        {
-+          "name": "qom-path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "operation",
-+          "type": "357"
-+        },
-+        {
-+          "name": "action",
-+          "type": "358"
-+        },
-+        {
-+          "name": "nospace",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "65",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "66",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "67",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "operation",
-+          "type": "357"
-+        },
-+        {
-+          "name": "action",
-+          "type": "358"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "68",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "69",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "70",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "amount-exceeded",
-+          "type": "int"
-+        },
-+        {
-+          "name": "write-threshold",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "71",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "write-threshold",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "72",
-+      "members": [
-+        {
-+          "name": "parent",
-+          "type": "str"
-+        },
-+        {
-+          "name": "child",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "73",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "iothread",
-+          "type": "359"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "74",
-+      "members": [
-+        {
-+          "name": "reference",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sector-num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "sectors-count",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "75",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "360"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sector-num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "sectors-count",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "76",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "77",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "78",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vm-state-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "date-sec",
-+          "type": "int"
-+        },
-+        {
-+          "name": "date-nsec",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vm-clock-sec",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vm-clock-nsec",
-+          "type": "int"
-+        },
-+        {
-+          "name": "icount",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "79",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "361"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "max-connections",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "80",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "description",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "writable",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "81",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "362"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "82",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "nbd",
-+          "type": "364"
-+        },
-+        {
-+          "case": "vhost-user-blk",
-+          "type": "365"
-+        },
-+        {
-+          "case": "fuse",
-+          "type": "366"
-+        },
-+        {
-+          "case": "vduse-blk",
-+          "type": "367"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "363"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "fixed-iothread",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "iothread",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "writable",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "writethrough",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "83",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "362"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "84",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[85]",
-+      "element-type": "85",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "85",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "363"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "shutting-down",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[86]",
-+      "element-type": "86",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "86",
-+      "members": [
-+        {
-+          "name": "label",
-+          "type": "str"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "frontend-open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[87]",
-+      "element-type": "87",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "87",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "88",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "data",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "368"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "89",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "368"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "str",
-+      "json-type": "string",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "90",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backend",
-+          "type": "369"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "91",
-+      "members": [
-+        {
-+          "name": "pty",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "92",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backend",
-+          "type": "369"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "93",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "94",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "95",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "96",
-+      "members": [
-+        {
-+          "name": "paging",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "protocol",
-+          "type": "str"
-+        },
-+        {
-+          "name": "detach",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "begin",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "370"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "97",
-+      "members": [
-+        {
-+          "name": "status",
-+          "type": "371"
-+        },
-+        {
-+          "name": "completed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "98",
-+      "members": [
-+        {
-+          "name": "result",
-+          "type": "97"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "99",
-+      "members": [
-+        {
-+          "name": "formats",
-+          "type": "[370]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "100",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "up",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "101",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "nic",
-+          "type": "373"
-+        },
-+        {
-+          "case": "user",
-+          "type": "374"
-+        },
-+        {
-+          "case": "tap",
-+          "type": "375"
-+        },
-+        {
-+          "case": "l2tpv3",
-+          "type": "376"
-+        },
-+        {
-+          "case": "socket",
-+          "type": "377"
-+        },
-+        {
-+          "case": "stream",
-+          "type": "378"
-+        },
-+        {
-+          "case": "dgram",
-+          "type": "379"
-+        },
-+        {
-+          "case": "vde",
-+          "type": "380"
-+        },
-+        {
-+          "case": "bridge",
-+          "type": "381"
-+        },
-+        {
-+          "case": "hubport",
-+          "type": "382"
-+        },
-+        {
-+          "case": "netmap",
-+          "type": "383"
-+        },
-+        {
-+          "case": "vhost-user",
-+          "type": "385"
-+        },
-+        {
-+          "case": "vhost-vdpa",
-+          "type": "386"
-+        },
-+        {
-+          "case": "none",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "372"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "102",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "103",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[104]",
-+      "element-type": "104",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "104",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "promiscuous",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "multicast",
-+          "type": "390"
-+        },
-+        {
-+          "name": "unicast",
-+          "type": "390"
-+        },
-+        {
-+          "name": "vlan",
-+          "type": "390"
-+        },
-+        {
-+          "name": "broadcast-allowed",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "multicast-overflow",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "unicast-overflow",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "main-mac",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vlan-table",
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "unicast-table",
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "multicast-table",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "105",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "106",
-+      "members": [
-+        {
-+          "name": "initial",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rounds",
-+          "type": "int"
-+        },
-+        {
-+          "name": "step",
-+          "type": "int"
-+        },
-+        {
-+          "name": "interfaces",
-+          "default": null,
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "107",
-+      "members": [
-+        {
-+          "name": "device-id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "108",
-+      "members": [
-+        {
-+          "name": "netdev-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "addr",
-+          "type": "391"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "109",
-+      "members": [
-+        {
-+          "name": "netdev-id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "110",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "392"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "111",
-+      "members": [
-+        {
-+          "name": "object",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "112",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "113",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "ports",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "114",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[115]",
-+      "element-type": "115",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "115",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "link-up",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "duplex",
-+          "type": "393"
-+        },
-+        {
-+          "name": "autoneg",
-+          "type": "394"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "116",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tbl-id",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[117]",
-+      "element-type": "117",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "117",
-+      "members": [
-+        {
-+          "name": "cookie",
-+          "type": "int"
-+        },
-+        {
-+          "name": "hits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "key",
-+          "type": "395"
-+        },
-+        {
-+          "name": "mask",
-+          "type": "396"
-+        },
-+        {
-+          "name": "action",
-+          "type": "397"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "118",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[119]",
-+      "element-type": "119",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "119",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "type",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "pport",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "index",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "out-pport",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "set-vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "pop-vlan",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group-ids",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "set-eth-src",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "set-eth-dst",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ttl-check",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[120]",
-+      "element-type": "120",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "120",
-+      "members": [
-+        {
-+          "name": "tpm-tis"
-+        },
-+        {
-+          "name": "tpm-crb"
-+        },
-+        {
-+          "name": "tpm-spapr"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "tpm-tis",
-+        "tpm-crb",
-+        "tpm-spapr"
-+      ]
-+    },
-+    {
-+      "name": "[121]",
-+      "element-type": "121",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "121",
-+      "members": [
-+        {
-+          "name": "passthrough"
-+        },
-+        {
-+          "name": "emulator"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "passthrough",
-+        "emulator"
-+      ]
-+    },
-+    {
-+      "name": "[122]",
-+      "element-type": "122",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "122",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "model",
-+          "type": "120"
-+        },
-+        {
-+          "name": "options",
-+          "type": "398"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "123",
-+      "tag": "protocol",
-+      "variants": [
-+        {
-+          "case": "vnc",
-+          "type": "401"
-+        },
-+        {
-+          "case": "spice",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "399"
-+        },
-+        {
-+          "name": "password",
-+          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "default": null,
-+          "type": "400"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "124",
-+      "tag": "protocol",
-+      "variants": [
-+        {
-+          "case": "vnc",
-+          "type": "402"
-+        },
-+        {
-+          "case": "spice",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "399"
-+        },
-+        {
-+          "name": "time",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "125",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "head",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "403"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "126",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "migrated",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tls-port",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "compiled-version",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "mouse-mode",
-+          "type": "404"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "[405]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "127",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "406"
-+        },
-+        {
-+          "name": "client",
-+          "type": "406"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "128",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "407"
-+        },
-+        {
-+          "name": "client",
-+          "type": "405"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "129",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "406"
-+        },
-+        {
-+          "name": "client",
-+          "type": "406"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "130",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "default": null,
-+          "type": "408"
-+        },
-+        {
-+          "name": "service",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "clients",
-+          "default": null,
-+          "type": "[409]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[131]",
-+      "element-type": "131",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "131",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "type": "[410]"
-+        },
-+        {
-+          "name": "clients",
-+          "type": "[409]"
-+        },
-+        {
-+          "name": "auth",
-+          "type": "411"
-+        },
-+        {
-+          "name": "vencrypt",
-+          "default": null,
-+          "type": "412"
-+        },
-+        {
-+          "name": "display",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "132",
-+      "members": [
-+        {
-+          "name": "password",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "133",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "413"
-+        },
-+        {
-+          "name": "client",
-+          "type": "414"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "134",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "413"
-+        },
-+        {
-+          "name": "client",
-+          "type": "409"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "135",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "413"
-+        },
-+        {
-+          "name": "client",
-+          "type": "409"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[136]",
-+      "element-type": "136",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "136",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "current",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "absolute",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "137",
-+      "members": [
-+        {
-+          "name": "keys",
-+          "type": "[415]"
-+        },
-+        {
-+          "name": "hold-time",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "138",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "head",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "events",
-+          "type": "[416]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "139",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "curses",
-+          "type": "421"
-+        },
-+        {
-+          "case": "egl-headless",
-+          "type": "422"
-+        },
-+        {
-+          "case": "dbus",
-+          "type": "423"
-+        },
-+        {
-+          "case": "sdl",
-+          "type": "424"
-+        },
-+        {
-+          "case": "default",
-+          "type": "0"
-+        },
-+        {
-+          "case": "none",
-+          "type": "0"
-+        },
-+        {
-+          "case": "spice-app",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "417"
-+        },
-+        {
-+          "name": "full-screen",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "window-close",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "show-cursor",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "gl",
-+          "default": null,
-+          "type": "418"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "140",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "vnc",
-+          "type": "426"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "425"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "141",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "vnc",
-+          "type": "428"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "427"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "142",
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "str"
-+        },
-+        {
-+          "name": "hostname",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tls-port",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cert-subject",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "143",
-+      "members": [
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "429"
-+        },
-+        {
-+          "name": "ram",
-+          "default": null,
-+          "type": "430"
-+        },
-+        {
-+          "name": "vfio",
-+          "default": null,
-+          "type": "431"
-+        },
-+        {
-+          "name": "xbzrle-cache",
-+          "default": null,
-+          "type": "432"
-+        },
-+        {
-+          "name": "total-time",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "expected-downtime",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "setup-time",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-percentage",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "error-desc",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "blocked-reasons",
-+          "default": null,
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "postcopy-blocktime",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "postcopy-vcpu-blocktime",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "socket-address",
-+          "default": null,
-+          "type": "[391]"
-+        },
-+        {
-+          "name": "dirty-limit-throttle-time-per-round",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-limit-ring-full-time",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "144",
-+      "members": [
-+        {
-+          "name": "capabilities",
-+          "type": "[145]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[145]",
-+      "element-type": "145",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "145",
-+      "members": [
-+        {
-+          "name": "capability",
-+          "type": "433"
-+        },
-+        {
-+          "name": "state",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "146",
-+      "members": [
-+        {
-+          "name": "announce-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-rounds",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-step",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-trigger-threshold",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-increment",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-tailslow",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "359"
-+        },
-+        {
-+          "name": "tls-hostname",
-+          "default": null,
-+          "type": "359"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "default": null,
-+          "type": "359"
-+        },
-+        {
-+          "name": "max-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "avail-switchover-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-checkpoint-delay",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "multifd-channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "xbzrle-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-postcopy-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-cpu-throttle",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-compression",
-+          "default": null,
-+          "type": "434"
-+        },
-+        {
-+          "name": "multifd-zlib-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-qatzip-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-zstd-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-bitmap-mapping",
-+          "default": null,
-+          "type": "[435]"
-+        },
-+        {
-+          "name": "x-vcpu-dirty-limit-period",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "vcpu-dirty-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "436"
-+        },
-+        {
-+          "name": "zero-page-detection",
-+          "default": null,
-+          "type": "437"
-+        },
-+        {
-+          "name": "direct-io",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "147",
-+      "members": [
-+        {
-+          "name": "announce-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-rounds",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-step",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-trigger-threshold",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-increment",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-tailslow",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-hostname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "max-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "avail-switchover-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-checkpoint-delay",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "multifd-channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "xbzrle-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-postcopy-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-cpu-throttle",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-compression",
-+          "default": null,
-+          "type": "434"
-+        },
-+        {
-+          "name": "multifd-zlib-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-qatzip-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-zstd-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-bitmap-mapping",
-+          "default": null,
-+          "type": "[435]"
-+        },
-+        {
-+          "name": "x-vcpu-dirty-limit-period",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "vcpu-dirty-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "436"
-+        },
-+        {
-+          "name": "zero-page-detection",
-+          "default": null,
-+          "type": "437"
-+        },
-+        {
-+          "name": "direct-io",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "148",
-+      "members": [
-+        {
-+          "name": "status",
-+          "type": "429"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "149",
-+      "members": [
-+        {
-+          "name": "pass",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "150",
-+      "members": [
-+        {
-+          "name": "mode",
-+          "type": "438"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "439"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "151",
-+      "members": [
-+        {
-+          "name": "state",
-+          "type": "429"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "152",
-+      "members": [
-+        {
-+          "name": "uri",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "[440]"
-+        },
-+        {
-+          "name": "detach",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "resume",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "153",
-+      "members": [
-+        {
-+          "name": "uri",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "[440]"
-+        },
-+        {
-+          "name": "exit-on-error",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "154",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "live",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "155",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "156",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "157",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "primary",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "failover",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "158",
-+      "members": [
-+        {
-+          "name": "error",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "desc",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "159",
-+      "members": [
-+        {
-+          "name": "mode",
-+          "type": "438"
-+        },
-+        {
-+          "name": "last-mode",
-+          "type": "438"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "439"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "160",
-+      "members": [
-+        {
-+          "name": "uri",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "161",
-+      "members": [
-+        {
-+          "name": "device-id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "162",
-+      "members": [
-+        {
-+          "name": "calc-time",
-+          "type": "int"
-+        },
-+        {
-+          "name": "calc-time-unit",
-+          "default": null,
-+          "type": "441"
-+        },
-+        {
-+          "name": "sample-pages",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "442"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "163",
-+      "members": [
-+        {
-+          "name": "calc-time-unit",
-+          "default": null,
-+          "type": "441"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "164",
-+      "members": [
-+        {
-+          "name": "dirty-rate",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "status",
-+          "type": "443"
-+        },
-+        {
-+          "name": "start-time",
-+          "type": "int"
-+        },
-+        {
-+          "name": "calc-time",
-+          "type": "int"
-+        },
-+        {
-+          "name": "calc-time-unit",
-+          "type": "441"
-+        },
-+        {
-+          "name": "sample-pages",
-+          "type": "int"
-+        },
-+        {
-+          "name": "mode",
-+          "type": "442"
-+        },
-+        {
-+          "name": "vcpu-dirty-rate",
-+          "default": null,
-+          "type": "[444]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "165",
-+      "members": [
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-rate",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "166",
-+      "members": [
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[167]",
-+      "element-type": "167",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "167",
-+      "members": [
-+        {
-+          "name": "cpu-index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "limit-rate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "current-rate",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[168]",
-+      "element-type": "168",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "168",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "thread-id",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "169",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tag",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vmstate",
-+          "type": "str"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "170",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tag",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vmstate",
-+          "type": "str"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "171",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tag",
-+          "type": "str"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "172",
-+      "members": [
-+        {
-+          "name": "actions",
-+          "type": "[445]"
-+        },
-+        {
-+          "name": "properties",
-+          "default": null,
-+          "type": "446"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "173",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[174]",
-+      "element-type": "174",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "174",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "state",
-+          "type": "447"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "175",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ignore-unavailable",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "176",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "default": null,
-+          "type": "[448]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "177",
-+      "members": [
-+        {
-+          "name": "qemu",
-+          "type": "449"
-+        },
-+        {
-+          "name": "package",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[178]",
-+      "element-type": "178",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "178",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[179]",
-+      "element-type": "179",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "179",
-+      "tag": "meta-type",
-+      "variants": [
-+        {
-+          "case": "builtin",
-+          "type": "451"
-+        },
-+        {
-+          "case": "enum",
-+          "type": "452"
-+        },
-+        {
-+          "case": "array",
-+          "type": "453"
-+        },
-+        {
-+          "case": "object",
-+          "type": "454"
-+        },
-+        {
-+          "case": "alternate",
-+          "type": "455"
-+        },
-+        {
-+          "case": "command",
-+          "type": "456"
-+        },
-+        {
-+          "case": "event",
-+          "type": "457"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "meta-type",
-+          "type": "450"
-+        },
-+        {
-+          "name": "features",
-+          "default": null,
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "180",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[181]",
-+      "element-type": "181",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "181",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "description",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "default-value",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "182",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "any",
-+      "json-type": "value",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "183",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        },
-+        {
-+          "name": "value",
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "184",
-+      "members": [
-+        {
-+          "name": "implements",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[185]",
-+      "element-type": "185",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "185",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "186",
-+      "members": [
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "187",
-+      "tag": "qom-type",
-+      "variants": [
-+        {
-+          "case": "acpi-generic-initiator",
-+          "type": "459"
-+        },
-+        {
-+          "case": "acpi-generic-port",
-+          "type": "460"
-+        },
-+        {
-+          "case": "authz-list",
-+          "type": "461"
-+        },
-+        {
-+          "case": "authz-listfile",
-+          "type": "462"
-+        },
-+        {
-+          "case": "authz-pam",
-+          "type": "463"
-+        },
-+        {
-+          "case": "authz-simple",
-+          "type": "464"
-+        },
-+        {
-+          "case": "can-host-socketcan",
-+          "type": "465"
-+        },
-+        {
-+          "case": "colo-compare",
-+          "type": "466"
-+        },
-+        {
-+          "case": "cryptodev-backend",
-+          "type": "467"
-+        },
-+        {
-+          "case": "cryptodev-backend-builtin",
-+          "type": "467"
-+        },
-+        {
-+          "case": "cryptodev-backend-lkcf",
-+          "type": "467"
-+        },
-+        {
-+          "case": "cryptodev-vhost-user",
-+          "type": "468"
-+        },
-+        {
-+          "case": "dbus-vmstate",
-+          "type": "469"
-+        },
-+        {
-+          "case": "filter-buffer",
-+          "type": "470"
-+        },
-+        {
-+          "case": "filter-dump",
-+          "type": "471"
-+        },
-+        {
-+          "case": "filter-mirror",
-+          "type": "472"
-+        },
-+        {
-+          "case": "filter-redirector",
-+          "type": "473"
-+        },
-+        {
-+          "case": "filter-replay",
-+          "type": "474"
-+        },
-+        {
-+          "case": "filter-rewriter",
-+          "type": "475"
-+        },
-+        {
-+          "case": "input-barrier",
-+          "type": "476"
-+        },
-+        {
-+          "case": "input-linux",
-+          "type": "477"
-+        },
-+        {
-+          "case": "iommufd",
-+          "type": "478"
-+        },
-+        {
-+          "case": "iothread",
-+          "type": "479"
-+        },
-+        {
-+          "case": "main-loop",
-+          "type": "480"
-+        },
-+        {
-+          "case": "memory-backend-epc",
-+          "type": "481"
-+        },
-+        {
-+          "case": "memory-backend-file",
-+          "type": "482"
-+        },
-+        {
-+          "case": "memory-backend-memfd",
-+          "type": "483"
-+        },
-+        {
-+          "case": "memory-backend-ram",
-+          "type": "484"
-+        },
-+        {
-+          "case": "memory-backend-shm",
-+          "type": "485"
-+        },
-+        {
-+          "case": "pr-manager-helper",
-+          "type": "486"
-+        },
-+        {
-+          "case": "qtest",
-+          "type": "487"
-+        },
-+        {
-+          "case": "rng-builtin",
-+          "type": "488"
-+        },
-+        {
-+          "case": "rng-egd",
-+          "type": "489"
-+        },
-+        {
-+          "case": "rng-random",
-+          "type": "490"
-+        },
-+        {
-+          "case": "secret",
-+          "type": "491"
-+        },
-+        {
-+          "case": "secret_keyring",
-+          "type": "492"
-+        },
-+        {
-+          "case": "sev-guest",
-+          "type": "493"
-+        },
-+        {
-+          "case": "sev-snp-guest",
-+          "type": "494"
-+        },
-+        {
-+          "case": "thread-context",
-+          "type": "495"
-+        },
-+        {
-+          "case": "throttle-group",
-+          "type": "496"
-+        },
-+        {
-+          "case": "tls-creds-anon",
-+          "type": "497"
-+        },
-+        {
-+          "case": "tls-creds-psk",
-+          "type": "498"
-+        },
-+        {
-+          "case": "tls-creds-x509",
-+          "type": "499"
-+        },
-+        {
-+          "case": "tls-cipher-suites",
-+          "type": "500"
-+        },
-+        {
-+          "case": "x-remote-object",
-+          "type": "501"
-+        },
-+        {
-+          "case": "x-vfio-user-server",
-+          "type": "502"
-+        },
-+        {
-+          "case": "can-bus",
-+          "type": "0"
-+        },
-+        {
-+          "case": "pef-guest",
-+          "type": "0"
-+        },
-+        {
-+          "case": "s390-pv-guest",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "qom-type",
-+          "type": "458"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "188",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "189",
-+      "members": [
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "190",
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bus",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "191",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "192",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "193",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "194",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[195]",
-+      "element-type": "195",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "195",
-+      "tag": "target",
-+      "variants": [
-+        {
-+          "case": "s390x",
-+          "type": "505"
-+        },
-+        {
-+          "case": "aarch64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "alpha",
-+          "type": "0"
-+        },
-+        {
-+          "case": "arm",
-+          "type": "0"
-+        },
-+        {
-+          "case": "avr",
-+          "type": "0"
-+        },
-+        {
-+          "case": "hppa",
-+          "type": "0"
-+        },
-+        {
-+          "case": "i386",
-+          "type": "0"
-+        },
-+        {
-+          "case": "loongarch64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "m68k",
-+          "type": "0"
-+        },
-+        {
-+          "case": "microblaze",
-+          "type": "0"
-+        },
-+        {
-+          "case": "microblazeel",
-+          "type": "0"
-+        },
-+        {
-+          "case": "mips",
-+          "type": "0"
-+        },
-+        {
-+          "case": "mips64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "mips64el",
-+          "type": "0"
-+        },
-+        {
-+          "case": "mipsel",
-+          "type": "0"
-+        },
-+        {
-+          "case": "or1k",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ppc",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ppc64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "riscv32",
-+          "type": "0"
-+        },
-+        {
-+          "case": "riscv64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "rx",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sh4",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sh4eb",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sparc",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sparc64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "tricore",
-+          "type": "0"
-+        },
-+        {
-+          "case": "x86_64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "xtensa",
-+          "type": "0"
-+        },
-+        {
-+          "case": "xtensaeb",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "cpu-index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "qom-path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "thread-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "503"
-+        },
-+        {
-+          "name": "target",
-+          "type": "504"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "196",
-+      "members": [
-+        {
-+          "name": "compat-props",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[197]",
-+      "element-type": "197",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "197",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "alias",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "is-default",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "cpu-max",
-+          "type": "int"
-+        },
-+        {
-+          "name": "hotpluggable-cpus",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "numa-mem-supported",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "deprecated",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "default-cpu-type",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "default-ram-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "acpi",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "compat-props",
-+          "default": null,
-+          "type": "[506]",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "198",
-+      "members": [
-+        {
-+          "name": "wakeup-suspend-support",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "199",
-+      "members": [
-+        {
-+          "name": "arch",
-+          "type": "504"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "200",
-+      "members": [
-+        {
-+          "name": "UUID",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "201",
-+      "members": [
-+        {
-+          "name": "guid",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "202",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "present",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "203",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "204",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[205]",
-+      "element-type": "205",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "205",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "merge",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dump",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "share",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "policy",
-+          "type": "507"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[206]",
-+      "element-type": "206",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "206",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vcpus-count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "props",
-+          "type": "503"
-+        },
-+        {
-+          "name": "qom-path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "207",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "node",
-+          "type": "509"
-+        },
-+        {
-+          "case": "dist",
-+          "type": "510"
-+        },
-+        {
-+          "case": "cpu",
-+          "type": "511"
-+        },
-+        {
-+          "case": "hmat-lb",
-+          "type": "512"
-+        },
-+        {
-+          "case": "hmat-cache",
-+          "type": "513"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "508"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "208",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "209",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "210",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "211",
-+      "members": [
-+        {
-+          "name": "committed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "available",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "212",
-+      "members": [
-+        {
-+          "name": "base-memory",
-+          "type": "int"
-+        },
-+        {
-+          "name": "plugged-memory",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[213]",
-+      "element-type": "213",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "213",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "dimm",
-+          "type": "515"
-+        },
-+        {
-+          "case": "nvdimm",
-+          "type": "515"
-+        },
-+        {
-+          "case": "virtio-pmem",
-+          "type": "516"
-+        },
-+        {
-+          "case": "virtio-mem",
-+          "type": "517"
-+        },
-+        {
-+          "case": "sgx-epc",
-+          "type": "518"
-+        },
-+        {
-+          "case": "hv-balloon",
-+          "type": "519"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "514"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "214",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "qom-path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "215",
-+      "members": [
-+        {
-+          "name": "human-readable-text",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "216",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "221",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "522"
-+        },
-+        {
-+          "name": "model",
-+          "type": "520"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "222",
-+      "members": [
-+        {
-+          "name": "model",
-+          "type": "520"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[223]",
-+      "element-type": "223",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "223",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "migration-safe",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "static",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "unavailable-features",
-+          "default": null,
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "alias-of",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "deprecated",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "227",
-+      "members": [
-+        {
-+          "name": "mode",
-+          "type": "525"
-+        },
-+        {
-+          "name": "filename",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "icount",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "228",
-+      "members": [
-+        {
-+          "name": "icount",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "229",
-+      "members": [
-+        {
-+          "name": "icount",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "230",
-+      "members": [
-+        {
-+          "name": "instances",
-+          "type": "[231]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[231]",
-+      "element-type": "231",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "231",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "block-node",
-+          "type": "527"
-+        },
-+        {
-+          "case": "chardev",
-+          "type": "528"
-+        },
-+        {
-+          "case": "migration",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "526"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "232",
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "str"
-+        },
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        },
-+        {
-+          "name": "skipauth",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "tls",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "233",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[234]",
-+      "element-type": "234",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "234",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "thread-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-max-ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-grow",
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-shrink",
-+          "type": "int"
-+        },
-+        {
-+          "name": "aio-max-batch",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "235",
-+      "members": [
-+        {
-+          "name": "command-line",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "236",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "238",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "239",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "240",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "241",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[242]",
-+      "element-type": "242",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "242",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fds",
-+          "type": "[529]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "243",
-+      "members": [
-+        {
-+          "name": "option",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[244]",
-+      "element-type": "244",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "244",
-+      "members": [
-+        {
-+          "name": "option",
-+          "type": "str"
-+        },
-+        {
-+          "name": "parameters",
-+          "type": "[530]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "245",
-+      "members": [
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "qom-path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "246",
-+      "members": [
-+        {
-+          "name": "vfu-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vfu-qom-path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "dev-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "dev-qom-path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "247",
-+      "tag": "sev-type",
-+      "variants": [
-+        {
-+          "case": "sev",
-+          "type": "533"
-+        },
-+        {
-+          "case": "sev-snp",
-+          "type": "534"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "api-major",
-+          "type": "int"
-+        },
-+        {
-+          "name": "api-minor",
-+          "type": "int"
-+        },
-+        {
-+          "name": "build-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "state",
-+          "type": "531"
-+        },
-+        {
-+          "name": "sev-type",
-+          "type": "532"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "248",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "249",
-+      "members": [
-+        {
-+          "name": "pdh",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cert-chain",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu0-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cbitpos",
-+          "type": "int"
-+        },
-+        {
-+          "name": "reduced-phys-bits",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "250",
-+      "members": [
-+        {
-+          "name": "packet-header",
-+          "type": "str"
-+        },
-+        {
-+          "name": "secret",
-+          "type": "str"
-+        },
-+        {
-+          "name": "gpa",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "251",
-+      "members": [
-+        {
-+          "name": "mnonce",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "252",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "255",
-+      "members": [
-+        {
-+          "name": "sgx",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "sgx1",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "sgx2",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "flc",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "sections",
-+          "type": "[535]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[256]",
-+      "element-type": "256",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "256",
-+      "members": [
-+        {
-+          "name": "port",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vcpu",
-+          "type": "int"
-+        },
-+        {
-+          "name": "type",
-+          "type": "536"
-+        },
-+        {
-+          "name": "remote-domain",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "int"
-+        },
-+        {
-+          "name": "pending",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "masked",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "257",
-+      "members": [
-+        {
-+          "name": "port",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[258]",
-+      "element-type": "258",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "258",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "none",
-+          "type": "538"
-+        },
-+        {
-+          "case": "alsa",
-+          "type": "539"
-+        },
-+        {
-+          "case": "dbus",
-+          "type": "541"
-+        },
-+        {
-+          "case": "oss",
-+          "type": "544"
-+        },
-+        {
-+          "case": "pa",
-+          "type": "545"
-+        },
-+        {
-+          "case": "sdl",
-+          "type": "547"
-+        },
-+        {
-+          "case": "spice",
-+          "type": "538"
-+        },
-+        {
-+          "case": "wav",
-+          "type": "549"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "driver",
-+          "type": "537"
-+        },
-+        {
-+          "name": "timer-period",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[259]",
-+      "element-type": "259",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "259",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "str"
-+        },
-+        {
-+          "name": "slot-type",
-+          "type": "550"
-+        },
-+        {
-+          "name": "source",
-+          "type": "int"
-+        },
-+        {
-+          "name": "status",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "260",
-+      "members": [
-+        {
-+          "name": "info",
-+          "type": "259"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[261]",
-+      "element-type": "261",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "261",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[551]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "262",
-+      "tag": "target",
-+      "variants": [
-+        {
-+          "case": "vcpu",
-+          "type": "554"
-+        },
-+        {
-+          "case": "vm",
-+          "type": "0"
-+        },
-+        {
-+          "case": "cryptodev",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "target",
-+          "type": "552"
-+        },
-+        {
-+          "name": "providers",
-+          "default": null,
-+          "type": "[553]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[263]",
-+      "element-type": "263",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "263",
-+      "members": [
-+        {
-+          "name": "provider",
-+          "type": "555"
-+        },
-+        {
-+          "name": "qom-path",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "stats",
-+          "type": "[556]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "264",
-+      "members": [
-+        {
-+          "name": "provider",
-+          "default": null,
-+          "type": "555"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[265]",
-+      "element-type": "265",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "265",
-+      "members": [
-+        {
-+          "name": "provider",
-+          "type": "555"
-+        },
-+        {
-+          "name": "target",
-+          "type": "552"
-+        },
-+        {
-+          "name": "stats",
-+          "type": "[557]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[266]",
-+      "element-type": "266",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "266",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "267",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "268",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "device-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vhost-started",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "device-endian",
-+          "type": "str"
-+        },
-+        {
-+          "name": "guest-features",
-+          "type": "558"
-+        },
-+        {
-+          "name": "host-features",
-+          "type": "558"
-+        },
-+        {
-+          "name": "backend-features",
-+          "type": "558"
-+        },
-+        {
-+          "name": "num-vqs",
-+          "type": "int"
-+        },
-+        {
-+          "name": "status",
-+          "type": "559"
-+        },
-+        {
-+          "name": "isr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "queue-sel",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vm-running",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "broken",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "disabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "use-started",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "started",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "start-on-kick",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "disable-legacy-check",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "bus-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "use-guest-notifier-mask",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "vhost-dev",
-+          "default": null,
-+          "type": "560"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "269",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "270",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue-index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "inuse",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-num-default",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-align",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-desc",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-avail",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-used",
-+          "type": "int"
-+        },
-+        {
-+          "name": "last-avail-idx",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "shadow-avail-idx",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "used-idx",
-+          "type": "int"
-+        },
-+        {
-+          "name": "signalled-used",
-+          "type": "int"
-+        },
-+        {
-+          "name": "signalled-used-valid",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "271",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "272",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "kick",
-+          "type": "int"
-+        },
-+        {
-+          "name": "call",
-+          "type": "int"
-+        },
-+        {
-+          "name": "desc",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avail",
-+          "type": "int"
-+        },
-+        {
-+          "name": "used",
-+          "type": "int"
-+        },
-+        {
-+          "name": "num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "desc-phys",
-+          "type": "int"
-+        },
-+        {
-+          "name": "desc-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avail-phys",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avail-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "used-phys",
-+          "type": "int"
-+        },
-+        {
-+          "name": "used-size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "273",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "type": "int"
-+        },
-+        {
-+          "name": "index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "274",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "descs",
-+          "type": "[561]"
-+        },
-+        {
-+          "name": "avail",
-+          "type": "562"
-+        },
-+        {
-+          "name": "used",
-+          "type": "563"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "275",
-+      "members": [
-+        {
-+          "name": "device-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "qom-path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "device-state",
-+          "type": "564"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[276]",
-+      "element-type": "276",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "276",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "[565]"
-+        },
-+        {
-+          "name": "client",
-+          "type": "[566]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "277",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "log",
-+          "type": "567"
-+        },
-+        {
-+          "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"
-+    },
-+    {
-+      "name": "278",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "log",
-+          "type": "567"
-+        },
-+        {
-+          "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": "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": "279",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "log",
-+          "type": "567"
-+        },
-+        {
-+          "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": "280",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "start",
-+          "type": "int"
-+        },
-+        {
-+          "name": "length",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "281",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "errors",
-+          "type": "[568]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "282",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "569"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "283",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "host-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "selection-policy",
-+          "type": "570"
-+        },
-+        {
-+          "name": "region",
-+          "type": "int"
-+        },
-+        {
-+          "name": "tag",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "extents",
-+          "type": "[571]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "284",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "host-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "removal-policy",
-+          "type": "572"
-+        },
-+        {
-+          "name": "forced-removal",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "sanitize-on-release",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "region",
-+          "type": "int"
-+        },
-+        {
-+          "name": "tag",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "extents",
-+          "type": "[571]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "bool",
-+      "json-type": "boolean",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "285",
-+      "members": [
-+        {
-+          "name": "debug"
-+        },
-+        {
-+          "name": "inmigrate"
-+        },
-+        {
-+          "name": "internal-error"
-+        },
-+        {
-+          "name": "io-error"
-+        },
-+        {
-+          "name": "paused"
-+        },
-+        {
-+          "name": "postmigrate"
-+        },
-+        {
-+          "name": "prelaunch"
-+        },
-+        {
-+          "name": "finish-migrate"
-+        },
-+        {
-+          "name": "restore-vm"
-+        },
-+        {
-+          "name": "running"
-+        },
-+        {
-+          "name": "save-vm"
-+        },
-+        {
-+          "name": "shutdown"
-+        },
-+        {
-+          "name": "suspended"
-+        },
-+        {
-+          "name": "watchdog"
-+        },
-+        {
-+          "name": "guest-panicked"
-+        },
-+        {
-+          "name": "colo"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "debug",
-+        "inmigrate",
-+        "internal-error",
-+        "io-error",
-+        "paused",
-+        "postmigrate",
-+        "prelaunch",
-+        "finish-migrate",
-+        "restore-vm",
-+        "running",
-+        "save-vm",
-+        "shutdown",
-+        "suspended",
-+        "watchdog",
-+        "guest-panicked",
-+        "colo"
-+      ]
-+    },
-+    {
-+      "name": "286",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "host-error"
-+        },
-+        {
-+          "name": "host-qmp-quit"
-+        },
-+        {
-+          "name": "host-qmp-system-reset"
-+        },
-+        {
-+          "name": "host-signal"
-+        },
-+        {
-+          "name": "host-ui"
-+        },
-+        {
-+          "name": "guest-shutdown"
-+        },
-+        {
-+          "name": "guest-reset"
-+        },
-+        {
-+          "name": "guest-panic"
-+        },
-+        {
-+          "name": "subsystem-reset"
-+        },
-+        {
-+          "name": "snapshot-load"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "host-error",
-+        "host-qmp-quit",
-+        "host-qmp-system-reset",
-+        "host-signal",
-+        "host-ui",
-+        "guest-shutdown",
-+        "guest-reset",
-+        "guest-panic",
-+        "subsystem-reset",
-+        "snapshot-load"
-+      ]
-+    },
-+    {
-+      "name": "287",
-+      "members": [
-+        {
-+          "name": "reset"
-+        },
-+        {
-+          "name": "shutdown"
-+        },
-+        {
-+          "name": "poweroff"
-+        },
-+        {
-+          "name": "pause"
-+        },
-+        {
-+          "name": "debug"
-+        },
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "inject-nmi"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "reset",
-+        "shutdown",
-+        "poweroff",
-+        "pause",
-+        "debug",
-+        "none",
-+        "inject-nmi"
-+      ]
-+    },
-+    {
-+      "name": "288",
-+      "members": [
-+        {
-+          "name": "reset"
-+        },
-+        {
-+          "name": "shutdown"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "reset",
-+        "shutdown"
-+      ]
-+    },
-+    {
-+      "name": "289",
-+      "members": [
-+        {
-+          "name": "poweroff"
-+        },
-+        {
-+          "name": "pause"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "poweroff",
-+        "pause"
-+      ]
-+    },
-+    {
-+      "name": "290",
-+      "members": [
-+        {
-+          "name": "pause"
-+        },
-+        {
-+          "name": "shutdown"
-+        },
-+        {
-+          "name": "exit-failure"
-+        },
-+        {
-+          "name": "none"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "pause",
-+        "shutdown",
-+        "exit-failure",
-+        "none"
-+      ]
-+    },
-+    {
-+      "name": "291",
-+      "members": [
-+        {
-+          "name": "pause"
-+        },
-+        {
-+          "name": "poweroff"
-+        },
-+        {
-+          "name": "run"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "pause",
-+        "poweroff",
-+        "run"
-+      ]
-+    },
-+    {
-+      "name": "292",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "hyper-v",
-+          "type": "574"
-+        },
-+        {
-+          "case": "s390",
-+          "type": "575"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "573"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "293",
-+      "members": [
-+        {
-+          "name": "hypervisor"
-+        },
-+        {
-+          "name": "guest"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "hypervisor",
-+        "guest"
-+      ]
-+    },
-+    {
-+      "name": "294",
-+      "members": [
-+        {
-+          "name": "ignore"
-+        },
-+        {
-+          "name": "inject"
-+        },
-+        {
-+          "name": "fatal"
-+        },
-+        {
-+          "name": "reset"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ignore",
-+        "inject",
-+        "fatal",
-+        "reset"
-+      ]
-+    },
-+    {
-+      "name": "295",
-+      "members": [
-+        {
-+          "name": "action-required",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "recursive",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "296",
-+      "members": [
-+        {
-+          "name": "undefined"
-+        },
-+        {
-+          "name": "created"
-+        },
-+        {
-+          "name": "running"
-+        },
-+        {
-+          "name": "paused"
-+        },
-+        {
-+          "name": "ready"
-+        },
-+        {
-+          "name": "standby"
-+        },
-+        {
-+          "name": "waiting"
-+        },
-+        {
-+          "name": "pending"
-+        },
-+        {
-+          "name": "aborting"
-+        },
-+        {
-+          "name": "concluded"
-+        },
-+        {
-+          "name": "null"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "undefined",
-+        "created",
-+        "running",
-+        "paused",
-+        "ready",
-+        "standby",
-+        "waiting",
-+        "pending",
-+        "aborting",
-+        "concluded",
-+        "null"
-+      ]
-+    },
-+    {
-+      "name": "297",
-+      "members": [
-+        {
-+          "name": "commit"
-+        },
-+        {
-+          "name": "stream"
-+        },
-+        {
-+          "name": "mirror"
-+        },
-+        {
-+          "name": "backup"
-+        },
-+        {
-+          "name": "create"
-+        },
-+        {
-+          "name": "amend"
-+        },
-+        {
-+          "name": "snapshot-load"
-+        },
-+        {
-+          "name": "snapshot-save"
-+        },
-+        {
-+          "name": "snapshot-delete"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "commit",
-+        "stream",
-+        "mirror",
-+        "backup",
-+        "create",
-+        "amend",
-+        "snapshot-load",
-+        "snapshot-save",
-+        "snapshot-delete"
-+      ]
-+    },
-+    {
-+      "name": "int",
-+      "json-type": "int",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "298",
-+      "members": [
-+        {
-+          "name": "retain"
-+        },
-+        {
-+          "name": "read-only"
-+        },
-+        {
-+          "name": "read-write"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "retain",
-+        "read-only",
-+        "read-write"
-+      ]
-+    },
-+    {
-+      "name": "[int]",
-+      "element-type": "int",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "299",
-+      "members": [
-+        {
-+          "name": "ok"
-+        },
-+        {
-+          "name": "failed"
-+        },
-+        {
-+          "name": "nospace"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ok",
-+        "failed",
-+        "nospace"
-+      ]
-+    },
-+    {
-+      "name": "300",
-+      "members": [
-+        {
-+          "name": "rd_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "zone_append_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "unmap_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "zone_append_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "unmap_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "zone_append_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flush_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "unmap_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_highest_offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_merged",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_merged",
-+          "type": "int"
-+        },
-+        {
-+          "name": "zone_append_merged",
-+          "type": "int"
-+        },
-+        {
-+          "name": "unmap_merged",
-+          "type": "int"
-+        },
-+        {
-+          "name": "idle_time_ns",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "failed_rd_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "failed_wr_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "failed_zone_append_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "failed_flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "failed_unmap_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_rd_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_wr_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_zone_append_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_unmap_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "account_invalid",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "account_failed",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "timed_stats",
-+          "type": "[576]"
-+        },
-+        {
-+          "name": "rd_latency_histogram",
-+          "default": null,
-+          "type": "577"
-+        },
-+        {
-+          "name": "wr_latency_histogram",
-+          "default": null,
-+          "type": "577"
-+        },
-+        {
-+          "name": "zone_append_latency_histogram",
-+          "default": null,
-+          "type": "577"
-+        },
-+        {
-+          "name": "flush_latency_histogram",
-+          "default": null,
-+          "type": "577"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "301",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "file",
-+          "type": "578"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "578"
-+        },
-+        {
-+          "case": "nvme",
-+          "type": "579"
-+        },
-+        {
-+          "case": "blkdebug",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blklogwrites",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkreplay",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "0"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "0"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "0"
-+        },
-+        {
-+          "case": "compress",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-before-write",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "0"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-access",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftps",
-+          "type": "0"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "0"
-+        },
-+        {
-+          "case": "host_cdrom",
-+          "type": "0"
-+        },
-+        {
-+          "case": "http",
-+          "type": "0"
-+        },
-+        {
-+          "case": "https",
-+          "type": "0"
-+        },
-+        {
-+          "case": "io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "iscsi",
-+          "type": "0"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nvme-io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "parallels",
-+          "type": "0"
-+        },
-+        {
-+          "case": "preallocate",
-+          "type": "0"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "0"
-+        },
-+        {
-+          "case": "qcow2",
-+          "type": "0"
-+        },
-+        {
-+          "case": "qed",
-+          "type": "0"
-+        },
-+        {
-+          "case": "quorum",
-+          "type": "0"
-+        },
-+        {
-+          "case": "raw",
-+          "type": "0"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "0"
-+        },
-+        {
-+          "case": "replication",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ssh",
-+          "type": "0"
-+        },
-+        {
-+          "case": "throttle",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vdi",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vfio-pci",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-user",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-vdpa",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vvfat",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "317"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "302",
-+      "members": [
-+        {
-+          "name": "actively-synced",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "303",
-+      "members": [
-+        {
-+          "name": "existing"
-+        },
-+        {
-+          "name": "absolute-paths"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "existing",
-+        "absolute-paths"
-+      ]
-+    },
-+    {
-+      "name": "304",
-+      "members": [
-+        {
-+          "name": "report"
-+        },
-+        {
-+          "name": "ignore"
-+        },
-+        {
-+          "name": "enospc"
-+        },
-+        {
-+          "name": "stop"
-+        },
-+        {
-+          "name": "auto"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "report",
-+        "ignore",
-+        "enospc",
-+        "stop",
-+        "auto"
-+      ]
-+    },
-+    {
-+      "name": "305",
-+      "members": [
-+        {
-+          "name": "top"
-+        },
-+        {
-+          "name": "full"
-+        },
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "incremental"
-+        },
-+        {
-+          "name": "bitmap"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "top",
-+        "full",
-+        "none",
-+        "incremental",
-+        "bitmap"
-+      ]
-+    },
-+    {
-+      "name": "306",
-+      "members": [
-+        {
-+          "name": "on-success"
-+        },
-+        {
-+          "name": "never"
-+        },
-+        {
-+          "name": "always"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "on-success",
-+        "never",
-+        "always"
-+      ]
-+    },
-+    {
-+      "name": "307",
-+      "members": [
-+        {
-+          "name": "use-copy-range",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "max-workers",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-chunk",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "min-cluster-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "308",
-+      "members": [
-+        {
-+          "name": "off"
-+        },
-+        {
-+          "name": "on"
-+        },
-+        {
-+          "name": "unmap"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on",
-+        "unmap"
-+      ]
-+    },
-+    {
-+      "name": "309",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "type": "str"
-+        },
-+        {
-+          "name": "dirty-flag",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "actual-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "virtual-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypted",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "compressed",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "backing-filename",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "full-backing-filename",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-filename-format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "snapshots",
-+          "default": null,
-+          "type": "[78]"
-+        },
-+        {
-+          "name": "format-specific",
-+          "default": null,
-+          "type": "580"
-+        },
-+        {
-+          "name": "backing-image",
-+          "default": null,
-+          "type": "309"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "310",
-+      "members": [
-+        {
-+          "name": "writeback",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "direct",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "no-flush",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[311]",
-+      "element-type": "311",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "311",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "granularity",
-+          "type": "int"
-+        },
-+        {
-+          "name": "recording",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "busy",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "persistent",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "inconsistent",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[312]",
-+      "element-type": "312",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "312",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "type",
-+          "type": "581"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[313]",
-+      "element-type": "313",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "313",
-+      "members": [
-+        {
-+          "name": "parent",
-+          "type": "int"
-+        },
-+        {
-+          "name": "child",
-+          "type": "int"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "perm",
-+          "type": "[582]"
-+        },
-+        {
-+          "name": "shared-perm",
-+          "type": "[582]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "314",
-+      "members": [
-+        {
-+          "name": "background"
-+        },
-+        {
-+          "name": "write-blocking"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "background",
-+        "write-blocking"
-+      ]
-+    },
-+    {
-+      "name": "[315]",
-+      "element-type": "315",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "315",
-+      "members": [
-+        {
-+          "type": "str"
-+        },
-+        {
-+          "type": "45"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "316",
-+      "members": [
-+        {
-+          "name": "copy-mode",
-+          "type": "314"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "317",
-+      "members": [
-+        {
-+          "name": "blkdebug"
-+        },
-+        {
-+          "name": "blklogwrites"
-+        },
-+        {
-+          "name": "blkreplay"
-+        },
-+        {
-+          "name": "blkverify"
-+        },
-+        {
-+          "name": "bochs"
-+        },
-+        {
-+          "name": "cloop"
-+        },
-+        {
-+          "name": "compress"
-+        },
-+        {
-+          "name": "copy-before-write"
-+        },
-+        {
-+          "name": "copy-on-read"
-+        },
-+        {
-+          "name": "dmg"
-+        },
-+        {
-+          "name": "file"
-+        },
-+        {
-+          "name": "snapshot-access"
-+        },
-+        {
-+          "name": "ftp"
-+        },
-+        {
-+          "name": "ftps"
-+        },
-+        {
-+          "name": "gluster",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "host_cdrom"
-+        },
-+        {
-+          "name": "host_device"
-+        },
-+        {
-+          "name": "http"
-+        },
-+        {
-+          "name": "https"
-+        },
-+        {
-+          "name": "io_uring"
-+        },
-+        {
-+          "name": "iscsi"
-+        },
-+        {
-+          "name": "luks"
-+        },
-+        {
-+          "name": "nbd"
-+        },
-+        {
-+          "name": "nfs"
-+        },
-+        {
-+          "name": "null-aio"
-+        },
-+        {
-+          "name": "null-co"
-+        },
-+        {
-+          "name": "nvme"
-+        },
-+        {
-+          "name": "nvme-io_uring"
-+        },
-+        {
-+          "name": "parallels"
-+        },
-+        {
-+          "name": "preallocate"
-+        },
-+        {
-+          "name": "qcow"
-+        },
-+        {
-+          "name": "qcow2"
-+        },
-+        {
-+          "name": "qed"
-+        },
-+        {
-+          "name": "quorum"
-+        },
-+        {
-+          "name": "raw"
-+        },
-+        {
-+          "name": "rbd"
-+        },
-+        {
-+          "name": "replication"
-+        },
-+        {
-+          "name": "ssh"
-+        },
-+        {
-+          "name": "throttle"
-+        },
-+        {
-+          "name": "vdi"
-+        },
-+        {
-+          "name": "vhdx"
-+        },
-+        {
-+          "name": "virtio-blk-vfio-pci"
-+        },
-+        {
-+          "name": "virtio-blk-vhost-user"
-+        },
-+        {
-+          "name": "virtio-blk-vhost-vdpa"
-+        },
-+        {
-+          "name": "vmdk"
-+        },
-+        {
-+          "name": "vpc"
-+        },
-+        {
-+          "name": "vvfat"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "blkdebug",
-+        "blklogwrites",
-+        "blkreplay",
-+        "blkverify",
-+        "bochs",
-+        "cloop",
-+        "compress",
-+        "copy-before-write",
-+        "copy-on-read",
-+        "dmg",
-+        "file",
-+        "snapshot-access",
-+        "ftp",
-+        "ftps",
-+        "gluster",
-+        "host_cdrom",
-+        "host_device",
-+        "http",
-+        "https",
-+        "io_uring",
-+        "iscsi",
-+        "luks",
-+        "nbd",
-+        "nfs",
-+        "null-aio",
-+        "null-co",
-+        "nvme",
-+        "nvme-io_uring",
-+        "parallels",
-+        "preallocate",
-+        "qcow",
-+        "qcow2",
-+        "qed",
-+        "quorum",
-+        "raw",
-+        "rbd",
-+        "replication",
-+        "ssh",
-+        "throttle",
-+        "vdi",
-+        "vhdx",
-+        "virtio-blk-vfio-pci",
-+        "virtio-blk-vhost-user",
-+        "virtio-blk-vhost-vdpa",
-+        "vmdk",
-+        "vpc",
-+        "vvfat"
-+      ]
-+    },
-+    {
-+      "name": "318",
-+      "members": [
-+        {
-+          "name": "ignore"
-+        },
-+        {
-+          "name": "unmap"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ignore",
-+        "unmap"
-+      ]
-+    },
-+    {
-+      "name": "319",
-+      "members": [
-+        {
-+          "name": "direct",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "no-flush",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "320",
-+      "members": [
-+        {
-+          "name": "image",
-+          "type": "583"
-+        },
-+        {
-+          "name": "config",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "align",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-transfer",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "opt-write-zero",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-write-zero",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "opt-discard",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-discard",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "inject-error",
-+          "default": null,
-+          "type": "[584]"
-+        },
-+        {
-+          "name": "set-state",
-+          "default": null,
-+          "type": "[585]"
-+        },
-+        {
-+          "name": "take-child-perms",
-+          "default": null,
-+          "type": "[582]"
-+        },
-+        {
-+          "name": "unshare-child-perms",
-+          "default": null,
-+          "type": "[582]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "321",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "log",
-+          "type": "583"
-+        },
-+        {
-+          "name": "log-sector-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "log-append",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "log-super-update-interval",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "322",
-+      "members": [
-+        {
-+          "name": "test",
-+          "type": "583"
-+        },
-+        {
-+          "name": "raw",
-+          "type": "583"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "323",
-+      "members": [
-+        {
-+          "name": "image",
-+          "type": "583"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "324",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "325",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "target",
-+          "type": "583"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "45"
-+        },
-+        {
-+          "name": "on-cbw-error",
-+          "default": null,
-+          "type": "586"
-+        },
-+        {
-+          "name": "cbw-timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "min-cluster-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "326",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "bottom",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "327",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "pr-manager",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "locking",
-+          "default": null,
-+          "type": "587"
-+        },
-+        {
-+          "name": "aio",
-+          "default": null,
-+          "type": "588"
-+        },
-+        {
-+          "name": "aio-max-batch",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "drop-cache",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-check-cache-dropped",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object",
-+      "features": [
-+        "dynamic-auto-read-only"
-+      ]
-+    },
-+    {
-+      "name": "328",
-+      "members": [
-+        {
-+          "name": "url",
-+          "type": "str"
-+        },
-+        {
-+          "name": "readahead",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-password-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "329",
-+      "members": [
-+        {
-+          "name": "url",
-+          "type": "str"
-+        },
-+        {
-+          "name": "readahead",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sslverify",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "330",
-+      "members": [
-+        {
-+          "name": "volume",
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "type": "[391]"
-+        },
-+        {
-+          "name": "debug",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "331",
-+      "members": [
-+        {
-+          "name": "url",
-+          "type": "str"
-+        },
-+        {
-+          "name": "readahead",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cookie",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cookie-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "332",
-+      "members": [
-+        {
-+          "name": "url",
-+          "type": "str"
-+        },
-+        {
-+          "name": "readahead",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cookie",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sslverify",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "cookie-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "333",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "334",
-+      "members": [
-+        {
-+          "name": "transport",
-+          "type": "589"
-+        },
-+        {
-+          "name": "portal",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "lun",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "initiator-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "header-digest",
-+          "default": null,
-+          "type": "590"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "335",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "header",
-+          "default": null,
-+          "type": "583"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "336",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "391"
-+        },
-+        {
-+          "name": "export",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-hostname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "x-dirty-bitmap",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "reconnect-delay",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "open-timeout",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "337",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "591"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tcp-syn-count",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "readahead-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "page-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "debug",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "338",
-+      "members": [
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "latency-ns",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "read-zeroes",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "339",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "namespace",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "340",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "341",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "prealloc-align",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "342",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "592"
-+        },
-+        {
-+          "name": "lazy-refcounts",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "pass-discard-request",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "pass-discard-snapshot",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "pass-discard-other",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "discard-no-unref",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "overlap-check",
-+          "default": null,
-+          "type": "593"
-+        },
-+        {
-+          "name": "cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "l2-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "l2-cache-entry-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "refcount-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cache-clean-interval",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "594"
-+        },
-+        {
-+          "name": "data-file",
-+          "default": null,
-+          "type": "583"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "343",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "592"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "595"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "344",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "592"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "345",
-+      "members": [
-+        {
-+          "name": "blkverify",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "children",
-+          "type": "[583]"
-+        },
-+        {
-+          "name": "vote-threshold",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rewrite-corrupted",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "read-pattern",
-+          "default": null,
-+          "type": "596"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "346",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "offset",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "347",
-+      "members": [
-+        {
-+          "name": "pool",
-+          "type": "str"
-+        },
-+        {
-+          "name": "namespace",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "image",
-+          "type": "str"
-+        },
-+        {
-+          "name": "conf",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "snapshot",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "597"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "auth-client-required",
-+          "default": null,
-+          "type": "[598]"
-+        },
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "[599]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "348",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "mode",
-+          "type": "600"
-+        },
-+        {
-+          "name": "top-id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "349",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "601"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "host-key-check",
-+          "default": null,
-+          "type": "602"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "350",
-+      "members": [
-+        {
-+          "name": "throttle-group",
-+          "type": "str"
-+        },
-+        {
-+          "name": "file",
-+          "type": "583"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "351",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "352",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "353",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object",
-+      "features": [
-+        "fdset"
-+      ]
-+    },
-+    {
-+      "name": "354",
-+      "members": [
-+        {
-+          "name": "dir",
-+          "type": "str"
-+        },
-+        {
-+          "name": "fat-type",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "floppy",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "label",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "rw",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[58]",
-+      "element-type": "58",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "355",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "file",
-+          "type": "603"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "604"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "605"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "606"
-+        },
-+        {
-+          "case": "parallels",
-+          "type": "607"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "608"
-+        },
-+        {
-+          "case": "qcow2",
-+          "type": "609"
-+        },
-+        {
-+          "case": "qed",
-+          "type": "610"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "611"
-+        },
-+        {
-+          "case": "ssh",
-+          "type": "612"
-+        },
-+        {
-+          "case": "vdi",
-+          "type": "613"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "614"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "615"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "616"
-+        },
-+        {
-+          "case": "blkdebug",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blklogwrites",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkreplay",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "0"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "0"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "0"
-+        },
-+        {
-+          "case": "compress",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-before-write",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "0"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-access",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftps",
-+          "type": "0"
-+        },
-+        {
-+          "case": "host_cdrom",
-+          "type": "0"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "0"
-+        },
-+        {
-+          "case": "http",
-+          "type": "0"
-+        },
-+        {
-+          "case": "https",
-+          "type": "0"
-+        },
-+        {
-+          "case": "io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "iscsi",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nvme",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nvme-io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "preallocate",
-+          "type": "0"
-+        },
-+        {
-+          "case": "quorum",
-+          "type": "0"
-+        },
-+        {
-+          "case": "raw",
-+          "type": "0"
-+        },
-+        {
-+          "case": "replication",
-+          "type": "0"
-+        },
-+        {
-+          "case": "throttle",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vfio-pci",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-user",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-vdpa",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vvfat",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "317"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "356",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "luks",
-+          "type": "617"
-+        },
-+        {
-+          "case": "qcow2",
-+          "type": "618"
-+        },
-+        {
-+          "case": "blkdebug",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blklogwrites",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkreplay",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "0"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "0"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "0"
-+        },
-+        {
-+          "case": "compress",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-before-write",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "0"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "0"
-+        },
-+        {
-+          "case": "file",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-access",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftps",
-+          "type": "0"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "0"
-+        },
-+        {
-+          "case": "host_cdrom",
-+          "type": "0"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "0"
-+        },
-+        {
-+          "case": "http",
-+          "type": "0"
-+        },
-+        {
-+          "case": "https",
-+          "type": "0"
-+        },
-+        {
-+          "case": "io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "iscsi",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nvme",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nvme-io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "parallels",
-+          "type": "0"
-+        },
-+        {
-+          "case": "preallocate",
-+          "type": "0"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "0"
-+        },
-+        {
-+          "case": "qed",
-+          "type": "0"
-+        },
-+        {
-+          "case": "quorum",
-+          "type": "0"
-+        },
-+        {
-+          "case": "raw",
-+          "type": "0"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "0"
-+        },
-+        {
-+          "case": "replication",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ssh",
-+          "type": "0"
-+        },
-+        {
-+          "case": "throttle",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vdi",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vfio-pci",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-user",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-vdpa",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vvfat",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "317"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "357",
-+      "members": [
-+        {
-+          "name": "read"
-+        },
-+        {
-+          "name": "write"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "read",
-+        "write"
-+      ]
-+    },
-+    {
-+      "name": "358",
-+      "members": [
-+        {
-+          "name": "ignore"
-+        },
-+        {
-+          "name": "report"
-+        },
-+        {
-+          "name": "stop"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ignore",
-+        "report",
-+        "stop"
-+      ]
-+    },
-+    {
-+      "name": "359",
-+      "members": [
-+        {
-+          "type": "str"
-+        },
-+        {
-+          "type": "null"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "360",
-+      "members": [
-+        {
-+          "name": "read"
-+        },
-+        {
-+          "name": "write"
-+        },
-+        {
-+          "name": "flush"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "read",
-+        "write",
-+        "flush"
-+      ]
-+    },
-+    {
-+      "name": "361",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "inet",
-+          "type": "620"
-+        },
-+        {
-+          "case": "unix",
-+          "type": "621"
-+        },
-+        {
-+          "case": "vsock",
-+          "type": "622"
-+        },
-+        {
-+          "case": "fd",
-+          "type": "623"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "619"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "362",
-+      "members": [
-+        {
-+          "name": "safe"
-+        },
-+        {
-+          "name": "hard"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "safe",
-+        "hard"
-+      ]
-+    },
-+    {
-+      "name": "363",
-+      "members": [
-+        {
-+          "name": "nbd"
-+        },
-+        {
-+          "name": "vhost-user-blk"
-+        },
-+        {
-+          "name": "fuse"
-+        },
-+        {
-+          "name": "vduse-blk"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "nbd",
-+        "vhost-user-blk",
-+        "fuse",
-+        "vduse-blk"
-+      ]
-+    },
-+    {
-+      "name": "364",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "description",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmaps",
-+          "default": null,
-+          "type": "[315]"
-+        },
-+        {
-+          "name": "allocation-depth",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "365",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "391"
-+        },
-+        {
-+          "name": "logical-block-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "num-queues",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "366",
-+      "members": [
-+        {
-+          "name": "mountpoint",
-+          "type": "str"
-+        },
-+        {
-+          "name": "growable",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "allow-other",
-+          "default": null,
-+          "type": "624"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "367",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "num-queues",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "queue-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "logical-block-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "serial",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "368",
-+      "members": [
-+        {
-+          "name": "utf8"
-+        },
-+        {
-+          "name": "base64"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "utf8",
-+        "base64"
-+      ]
-+    },
-+    {
-+      "name": "369",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "file",
-+          "type": "626"
-+        },
-+        {
-+          "case": "serial",
-+          "type": "627"
-+        },
-+        {
-+          "case": "parallel",
-+          "type": "627"
-+        },
-+        {
-+          "case": "pipe",
-+          "type": "627"
-+        },
-+        {
-+          "case": "socket",
-+          "type": "628"
-+        },
-+        {
-+          "case": "udp",
-+          "type": "629"
-+        },
-+        {
-+          "case": "pty",
-+          "type": "630"
-+        },
-+        {
-+          "case": "null",
-+          "type": "631"
-+        },
-+        {
-+          "case": "mux",
-+          "type": "632"
-+        },
-+        {
-+          "case": "hub",
-+          "type": "633"
-+        },
-+        {
-+          "case": "msmouse",
-+          "type": "631"
-+        },
-+        {
-+          "case": "wctablet",
-+          "type": "631"
-+        },
-+        {
-+          "case": "braille",
-+          "type": "631"
-+        },
-+        {
-+          "case": "testdev",
-+          "type": "631"
-+        },
-+        {
-+          "case": "stdio",
-+          "type": "634"
-+        },
-+        {
-+          "case": "spicevmc",
-+          "type": "635"
-+        },
-+        {
-+          "case": "spiceport",
-+          "type": "636"
-+        },
-+        {
-+          "case": "qemu-vdagent",
-+          "type": "637"
-+        },
-+        {
-+          "case": "dbus",
-+          "type": "638"
-+        },
-+        {
-+          "case": "vc",
-+          "type": "639"
-+        },
-+        {
-+          "case": "ringbuf",
-+          "type": "640"
-+        },
-+        {
-+          "case": "memory",
-+          "type": "640"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "625"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "370",
-+      "members": [
-+        {
-+          "name": "elf"
-+        },
-+        {
-+          "name": "kdump-zlib"
-+        },
-+        {
-+          "name": "kdump-lzo"
-+        },
-+        {
-+          "name": "kdump-snappy"
-+        },
-+        {
-+          "name": "kdump-raw-zlib"
-+        },
-+        {
-+          "name": "kdump-raw-lzo"
-+        },
-+        {
-+          "name": "kdump-raw-snappy"
-+        },
-+        {
-+          "name": "win-dmp"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "elf",
-+        "kdump-zlib",
-+        "kdump-lzo",
-+        "kdump-snappy",
-+        "kdump-raw-zlib",
-+        "kdump-raw-lzo",
-+        "kdump-raw-snappy",
-+        "win-dmp"
-+      ]
-+    },
-+    {
-+      "name": "371",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "active"
-+        },
-+        {
-+          "name": "completed"
-+        },
-+        {
-+          "name": "failed"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "active",
-+        "completed",
-+        "failed"
-+      ]
-+    },
-+    {
-+      "name": "[370]",
-+      "element-type": "370",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "372",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "nic"
-+        },
-+        {
-+          "name": "user"
-+        },
-+        {
-+          "name": "tap"
-+        },
-+        {
-+          "name": "l2tpv3"
-+        },
-+        {
-+          "name": "socket"
-+        },
-+        {
-+          "name": "stream"
-+        },
-+        {
-+          "name": "dgram"
-+        },
-+        {
-+          "name": "vde"
-+        },
-+        {
-+          "name": "bridge"
-+        },
-+        {
-+          "name": "hubport"
-+        },
-+        {
-+          "name": "netmap"
-+        },
-+        {
-+          "name": "vhost-user"
-+        },
-+        {
-+          "name": "vhost-vdpa"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "nic",
-+        "user",
-+        "tap",
-+        "l2tpv3",
-+        "socket",
-+        "stream",
-+        "dgram",
-+        "vde",
-+        "bridge",
-+        "hubport",
-+        "netmap",
-+        "vhost-user",
-+        "vhost-vdpa"
-+      ]
-+    },
-+    {
-+      "name": "373",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "macaddr",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "model",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "addr",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vectors",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "374",
-+      "members": [
-+        {
-+          "name": "hostname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "restrict",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ipv4",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ipv6",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ip",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "net",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "host",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tftp",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "bootfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "dhcpstart",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "dns",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "dnssearch",
-+          "default": null,
-+          "type": "[641]"
-+        },
-+        {
-+          "name": "domainname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ipv6-prefix",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ipv6-prefixlen",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "ipv6-host",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ipv6-dns",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "smb",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "smbserver",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "hostfwd",
-+          "default": null,
-+          "type": "[641]"
-+        },
-+        {
-+          "name": "guestfwd",
-+          "default": null,
-+          "type": "[641]"
-+        },
-+        {
-+          "name": "tftp-server-name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "375",
-+      "members": [
-+        {
-+          "name": "ifname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "fds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "script",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "downscript",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "br",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "helper",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sndbuf",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "vnet_hdr",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "vhost",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "vhostfd",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vhostfds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vhostforce",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "queues",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-us",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "376",
-+      "members": [
-+        {
-+          "name": "src",
-+          "type": "str"
-+        },
-+        {
-+          "name": "dst",
-+          "type": "str"
-+        },
-+        {
-+          "name": "srcport",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "dstport",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ipv6",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "udp",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "cookie64",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "counter",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "pincounter",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "txcookie",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "rxcookie",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "txsession",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rxsession",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "377",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "listen",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "connect",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "mcast",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "localaddr",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "udp",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "378",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "391"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reconnect",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "reconnect-ms",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "379",
-+      "members": [
-+        {
-+          "name": "local",
-+          "default": null,
-+          "type": "391"
-+        },
-+        {
-+          "name": "remote",
-+          "default": null,
-+          "type": "391"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "380",
-+      "members": [
-+        {
-+          "name": "sock",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "381",
-+      "members": [
-+        {
-+          "name": "br",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "helper",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "382",
-+      "members": [
-+        {
-+          "name": "hubid",
-+          "type": "int"
-+        },
-+        {
-+          "name": "netdev",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "383",
-+      "members": [
-+        {
-+          "name": "ifname",
-+          "type": "str"
-+        },
-+        {
-+          "name": "devname",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "385",
-+      "members": [
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vhostforce",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "queues",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "386",
-+      "members": [
-+        {
-+          "name": "vhostdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vhostfd",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "queues",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-svq",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "390",
-+      "members": [
-+        {
-+          "name": "normal"
-+        },
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "all"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "normal",
-+        "none",
-+        "all"
-+      ]
-+    },
-+    {
-+      "name": "[str]",
-+      "element-type": "str",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "391",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "inet",
-+          "type": "601"
-+        },
-+        {
-+          "case": "unix",
-+          "type": "643"
-+        },
-+        {
-+          "case": "vsock",
-+          "type": "644"
-+        },
-+        {
-+          "case": "fd",
-+          "type": "645"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "619"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "392",
-+      "members": [
-+        {
-+          "name": "rss"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "rss"
-+      ]
-+    },
-+    {
-+      "name": "393",
-+      "members": [
-+        {
-+          "name": "half"
-+        },
-+        {
-+          "name": "full"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "half",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "394",
-+      "members": [
-+        {
-+          "name": "off"
-+        },
-+        {
-+          "name": "on"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on"
-+      ]
-+    },
-+    {
-+      "name": "395",
-+      "members": [
-+        {
-+          "name": "priority",
-+          "type": "int"
-+        },
-+        {
-+          "name": "tbl-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "in-pport",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tunnel-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "eth-type",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "eth-src",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "eth-dst",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ip-proto",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "ip-tos",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "ip-dst",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "396",
-+      "members": [
-+        {
-+          "name": "in-pport",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tunnel-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "eth-src",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "eth-dst",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ip-proto",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "ip-tos",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "397",
-+      "members": [
-+        {
-+          "name": "goto-tbl",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tunnel-lport",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "new-vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "out-pport",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "398",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "passthrough",
-+          "type": "646"
-+        },
-+        {
-+          "case": "emulator",
-+          "type": "647"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "121"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "399",
-+      "members": [
-+        {
-+          "name": "vnc"
-+        },
-+        {
-+          "name": "spice"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "vnc",
-+        "spice"
-+      ]
-+    },
-+    {
-+      "name": "400",
-+      "members": [
-+        {
-+          "name": "keep"
-+        },
-+        {
-+          "name": "fail"
-+        },
-+        {
-+          "name": "disconnect"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "keep",
-+        "fail",
-+        "disconnect"
-+      ]
-+    },
-+    {
-+      "name": "401",
-+      "members": [
-+        {
-+          "name": "display",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "402",
-+      "members": [
-+        {
-+          "name": "display",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "403",
-+      "members": [
-+        {
-+          "name": "ppm"
-+        },
-+        {
-+          "name": "png"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ppm",
-+        "png"
-+      ]
-+    },
-+    {
-+      "name": "404",
-+      "members": [
-+        {
-+          "name": "client"
-+        },
-+        {
-+          "name": "server"
-+        },
-+        {
-+          "name": "unknown"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "client",
-+        "server",
-+        "unknown"
-+      ]
-+    },
-+    {
-+      "name": "[405]",
-+      "element-type": "405",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "405",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "408"
-+        },
-+        {
-+          "name": "connection-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "channel-type",
-+          "type": "int"
-+        },
-+        {
-+          "name": "channel-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "tls",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "406",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "408"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "407",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "408"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "408",
-+      "members": [
-+        {
-+          "name": "ipv4"
-+        },
-+        {
-+          "name": "ipv6"
-+        },
-+        {
-+          "name": "unix"
-+        },
-+        {
-+          "name": "vsock"
-+        },
-+        {
-+          "name": "unknown"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ipv4",
-+        "ipv6",
-+        "unix",
-+        "vsock",
-+        "unknown"
-+      ]
-+    },
-+    {
-+      "name": "[409]",
-+      "element-type": "409",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "409",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "408"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x509_dname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sasl_username",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[410]",
-+      "element-type": "410",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "410",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "408"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auth",
-+          "type": "411"
-+        },
-+        {
-+          "name": "vencrypt",
-+          "default": null,
-+          "type": "412"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "411",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "vnc"
-+        },
-+        {
-+          "name": "ra2"
-+        },
-+        {
-+          "name": "ra2ne"
-+        },
-+        {
-+          "name": "tight"
-+        },
-+        {
-+          "name": "ultra"
-+        },
-+        {
-+          "name": "tls"
-+        },
-+        {
-+          "name": "vencrypt"
-+        },
-+        {
-+          "name": "sasl"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "vnc",
-+        "ra2",
-+        "ra2ne",
-+        "tight",
-+        "ultra",
-+        "tls",
-+        "vencrypt",
-+        "sasl"
-+      ]
-+    },
-+    {
-+      "name": "412",
-+      "members": [
-+        {
-+          "name": "plain"
-+        },
-+        {
-+          "name": "tls-none"
-+        },
-+        {
-+          "name": "x509-none"
-+        },
-+        {
-+          "name": "tls-vnc"
-+        },
-+        {
-+          "name": "x509-vnc"
-+        },
-+        {
-+          "name": "tls-plain"
-+        },
-+        {
-+          "name": "x509-plain"
-+        },
-+        {
-+          "name": "tls-sasl"
-+        },
-+        {
-+          "name": "x509-sasl"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "plain",
-+        "tls-none",
-+        "x509-none",
-+        "tls-vnc",
-+        "x509-vnc",
-+        "tls-plain",
-+        "x509-plain",
-+        "tls-sasl",
-+        "x509-sasl"
-+      ]
-+    },
-+    {
-+      "name": "413",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "408"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "414",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "408"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[415]",
-+      "element-type": "415",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "415",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "number",
-+          "type": "649"
-+        },
-+        {
-+          "case": "qcode",
-+          "type": "650"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "648"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[416]",
-+      "element-type": "416",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "416",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "key",
-+          "type": "652"
-+        },
-+        {
-+          "case": "btn",
-+          "type": "653"
-+        },
-+        {
-+          "case": "rel",
-+          "type": "654"
-+        },
-+        {
-+          "case": "abs",
-+          "type": "654"
-+        },
-+        {
-+          "case": "mtt",
-+          "type": "655"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "651"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "417",
-+      "members": [
-+        {
-+          "name": "default"
-+        },
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "sdl"
-+        },
-+        {
-+          "name": "egl-headless"
-+        },
-+        {
-+          "name": "curses"
-+        },
-+        {
-+          "name": "spice-app"
-+        },
-+        {
-+          "name": "dbus"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "default",
-+        "none",
-+        "sdl",
-+        "egl-headless",
-+        "curses",
-+        "spice-app",
-+        "dbus"
-+      ]
-+    },
-+    {
-+      "name": "418",
-+      "members": [
-+        {
-+          "name": "off"
-+        },
-+        {
-+          "name": "on"
-+        },
-+        {
-+          "name": "core"
-+        },
-+        {
-+          "name": "es"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on",
-+        "core",
-+        "es"
-+      ]
-+    },
-+    {
-+      "name": "419",
-+      "members": [
-+        {
-+          "name": "grab-on-hover",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "zoom-to-fit",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "show-tabs",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "show-menubar",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "420",
-+      "members": [
-+        {
-+          "name": "left-command-key",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "full-grab",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "swap-opt-cmd",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "zoom-to-fit",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "zoom-interpolation",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "421",
-+      "members": [
-+        {
-+          "name": "charset",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "422",
-+      "members": [
-+        {
-+          "name": "rendernode",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "423",
-+      "members": [
-+        {
-+          "name": "rendernode",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "addr",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "p2p",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "audiodev",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "424",
-+      "members": [
-+        {
-+          "name": "grab-mod",
-+          "default": null,
-+          "type": "656"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "425",
-+      "members": [
-+        {
-+          "name": "vnc"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "vnc"
-+      ]
-+    },
-+    {
-+      "name": "426",
-+      "members": [
-+        {
-+          "name": "tls-certs",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "427",
-+      "members": [
-+        {
-+          "name": "vnc"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "vnc"
-+      ]
-+    },
-+    {
-+      "name": "428",
-+      "members": [
-+        {
-+          "name": "addresses",
-+          "default": null,
-+          "type": "[391]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "429",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "setup"
-+        },
-+        {
-+          "name": "cancelling"
-+        },
-+        {
-+          "name": "cancelled"
-+        },
-+        {
-+          "name": "active"
-+        },
-+        {
-+          "name": "postcopy-active"
-+        },
-+        {
-+          "name": "postcopy-paused"
-+        },
-+        {
-+          "name": "postcopy-recover-setup"
-+        },
-+        {
-+          "name": "postcopy-recover"
-+        },
-+        {
-+          "name": "completed"
-+        },
-+        {
-+          "name": "failed"
-+        },
-+        {
-+          "name": "colo"
-+        },
-+        {
-+          "name": "pre-switchover"
-+        },
-+        {
-+          "name": "device"
-+        },
-+        {
-+          "name": "wait-unplug"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "setup",
-+        "cancelling",
-+        "cancelled",
-+        "active",
-+        "postcopy-active",
-+        "postcopy-paused",
-+        "postcopy-recover-setup",
-+        "postcopy-recover",
-+        "completed",
-+        "failed",
-+        "colo",
-+        "pre-switchover",
-+        "device",
-+        "wait-unplug"
-+      ]
-+    },
-+    {
-+      "name": "430",
-+      "members": [
-+        {
-+          "name": "transferred",
-+          "type": "int"
-+        },
-+        {
-+          "name": "remaining",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total",
-+          "type": "int"
-+        },
-+        {
-+          "name": "duplicate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "normal",
-+          "type": "int"
-+        },
-+        {
-+          "name": "normal-bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-pages-rate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "mbps",
-+          "type": "number"
-+        },
-+        {
-+          "name": "dirty-sync-count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "postcopy-requests",
-+          "type": "int"
-+        },
-+        {
-+          "name": "page-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "pages-per-second",
-+          "type": "int"
-+        },
-+        {
-+          "name": "precopy-bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime-bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "postcopy-bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-sync-missed-zero-copy",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "431",
-+      "members": [
-+        {
-+          "name": "transferred",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "432",
-+      "members": [
-+        {
-+          "name": "cache-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "pages",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cache-miss",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cache-miss-rate",
-+          "type": "number"
-+        },
-+        {
-+          "name": "encoding-rate",
-+          "type": "number"
-+        },
-+        {
-+          "name": "overflow",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[391]",
-+      "element-type": "391",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "433",
-+      "members": [
-+        {
-+          "name": "xbzrle"
-+        },
-+        {
-+          "name": "rdma-pin-all"
-+        },
-+        {
-+          "name": "auto-converge"
-+        },
-+        {
-+          "name": "zero-blocks",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "events"
-+        },
-+        {
-+          "name": "postcopy-ram"
-+        },
-+        {
-+          "name": "x-colo",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "release-ram"
-+        },
-+        {
-+          "name": "return-path"
-+        },
-+        {
-+          "name": "pause-before-switchover"
-+        },
-+        {
-+          "name": "multifd"
-+        },
-+        {
-+          "name": "dirty-bitmaps"
-+        },
-+        {
-+          "name": "postcopy-blocktime"
-+        },
-+        {
-+          "name": "late-block-activate"
-+        },
-+        {
-+          "name": "x-ignore-shared",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "validate-uuid"
-+        },
-+        {
-+          "name": "background-snapshot"
-+        },
-+        {
-+          "name": "zero-copy-send"
-+        },
-+        {
-+          "name": "postcopy-preempt"
-+        },
-+        {
-+          "name": "switchover-ack"
-+        },
-+        {
-+          "name": "dirty-limit"
-+        },
-+        {
-+          "name": "mapped-ram"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "xbzrle",
-+        "rdma-pin-all",
-+        "auto-converge",
-+        "zero-blocks",
-+        "events",
-+        "postcopy-ram",
-+        "x-colo",
-+        "release-ram",
-+        "return-path",
-+        "pause-before-switchover",
-+        "multifd",
-+        "dirty-bitmaps",
-+        "postcopy-blocktime",
-+        "late-block-activate",
-+        "x-ignore-shared",
-+        "validate-uuid",
-+        "background-snapshot",
-+        "zero-copy-send",
-+        "postcopy-preempt",
-+        "switchover-ack",
-+        "dirty-limit",
-+        "mapped-ram"
-+      ]
-+    },
-+    {
-+      "name": "434",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "zlib"
-+        },
-+        {
-+          "name": "zstd"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "zlib",
-+        "zstd"
-+      ]
-+    },
-+    {
-+      "name": "[435]",
-+      "element-type": "435",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "435",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "alias",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmaps",
-+          "type": "[657]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "436",
-+      "members": [
-+        {
-+          "name": "normal"
-+        },
-+        {
-+          "name": "cpr-reboot"
-+        },
-+        {
-+          "name": "cpr-transfer"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "normal",
-+        "cpr-reboot",
-+        "cpr-transfer"
-+      ]
-+    },
-+    {
-+      "name": "437",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "legacy"
-+        },
-+        {
-+          "name": "multifd"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "legacy",
-+        "multifd"
-+      ]
-+    },
-+    {
-+      "name": "438",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "primary"
-+        },
-+        {
-+          "name": "secondary"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "primary",
-+        "secondary"
-+      ]
-+    },
-+    {
-+      "name": "439",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "request"
-+        },
-+        {
-+          "name": "error"
-+        },
-+        {
-+          "name": "processing"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "request",
-+        "error",
-+        "processing"
-+      ]
-+    },
-+    {
-+      "name": "[440]",
-+      "element-type": "440",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "440",
-+      "members": [
-+        {
-+          "name": "channel-type",
-+          "type": "658"
-+        },
-+        {
-+          "name": "addr",
-+          "type": "659"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "441",
-+      "members": [
-+        {
-+          "name": "second"
-+        },
-+        {
-+          "name": "millisecond"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "second",
-+        "millisecond"
-+      ]
-+    },
-+    {
-+      "name": "442",
-+      "members": [
-+        {
-+          "name": "page-sampling"
-+        },
-+        {
-+          "name": "dirty-ring"
-+        },
-+        {
-+          "name": "dirty-bitmap"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "page-sampling",
-+        "dirty-ring",
-+        "dirty-bitmap"
-+      ]
-+    },
-+    {
-+      "name": "443",
-+      "members": [
-+        {
-+          "name": "unstarted"
-+        },
-+        {
-+          "name": "measuring"
-+        },
-+        {
-+          "name": "measured"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "unstarted",
-+        "measuring",
-+        "measured"
-+      ]
-+    },
-+    {
-+      "name": "[444]",
-+      "element-type": "444",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "444",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-rate",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[445]",
-+      "element-type": "445",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "445",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "abort",
-+          "type": "661"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-add",
-+          "type": "662"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-remove",
-+          "type": "663"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-clear",
-+          "type": "663"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-enable",
-+          "type": "663"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-disable",
-+          "type": "663"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-merge",
-+          "type": "664"
-+        },
-+        {
-+          "case": "blockdev-backup",
-+          "type": "665"
-+        },
-+        {
-+          "case": "blockdev-snapshot",
-+          "type": "666"
-+        },
-+        {
-+          "case": "blockdev-snapshot-internal-sync",
-+          "type": "667"
-+        },
-+        {
-+          "case": "blockdev-snapshot-sync",
-+          "type": "668"
-+        },
-+        {
-+          "case": "drive-backup",
-+          "type": "669"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "660"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "446",
-+      "members": [
-+        {
-+          "name": "completion-mode",
-+          "default": null,
-+          "type": "670"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "447",
-+      "members": [
-+        {
-+          "name": "unavailable"
-+        },
-+        {
-+          "name": "disabled"
-+        },
-+        {
-+          "name": "enabled"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "unavailable",
-+        "disabled",
-+        "enabled"
-+      ]
-+    },
-+    {
-+      "name": "[448]",
-+      "element-type": "448",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "448",
-+      "members": [
-+        {
-+          "name": "oob"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "oob"
-+      ]
-+    },
-+    {
-+      "name": "449",
-+      "members": [
-+        {
-+          "name": "major",
-+          "type": "int"
-+        },
-+        {
-+          "name": "minor",
-+          "type": "int"
-+        },
-+        {
-+          "name": "micro",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "450",
-+      "members": [
-+        {
-+          "name": "builtin"
-+        },
-+        {
-+          "name": "enum"
-+        },
-+        {
-+          "name": "array"
-+        },
-+        {
-+          "name": "object"
-+        },
-+        {
-+          "name": "alternate"
-+        },
-+        {
-+          "name": "command"
-+        },
-+        {
-+          "name": "event"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "builtin",
-+        "enum",
-+        "array",
-+        "object",
-+        "alternate",
-+        "command",
-+        "event"
-+      ]
-+    },
-+    {
-+      "name": "451",
-+      "members": [
-+        {
-+          "name": "json-type",
-+          "type": "671"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "452",
-+      "members": [
-+        {
-+          "name": "members",
-+          "type": "[672]"
-+        },
-+        {
-+          "name": "values",
-+          "type": "[str]",
-+          "features": [
-+            "deprecated"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "453",
-+      "members": [
-+        {
-+          "name": "element-type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "454",
-+      "members": [
-+        {
-+          "name": "members",
-+          "type": "[673]"
-+        },
-+        {
-+          "name": "tag",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "variants",
-+          "default": null,
-+          "type": "[674]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "455",
-+      "members": [
-+        {
-+          "name": "members",
-+          "type": "[675]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "456",
-+      "members": [
-+        {
-+          "name": "arg-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "ret-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "allow-oob",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "457",
-+      "members": [
-+        {
-+          "name": "arg-type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "458",
-+      "members": [
-+        {
-+          "name": "acpi-generic-initiator"
-+        },
-+        {
-+          "name": "acpi-generic-port"
-+        },
-+        {
-+          "name": "authz-list"
-+        },
-+        {
-+          "name": "authz-listfile"
-+        },
-+        {
-+          "name": "authz-pam"
-+        },
-+        {
-+          "name": "authz-simple"
-+        },
-+        {
-+          "name": "can-bus"
-+        },
-+        {
-+          "name": "can-host-socketcan"
-+        },
-+        {
-+          "name": "colo-compare"
-+        },
-+        {
-+          "name": "cryptodev-backend"
-+        },
-+        {
-+          "name": "cryptodev-backend-builtin"
-+        },
-+        {
-+          "name": "cryptodev-backend-lkcf"
-+        },
-+        {
-+          "name": "cryptodev-vhost-user"
-+        },
-+        {
-+          "name": "dbus-vmstate"
-+        },
-+        {
-+          "name": "filter-buffer"
-+        },
-+        {
-+          "name": "filter-dump"
-+        },
-+        {
-+          "name": "filter-mirror"
-+        },
-+        {
-+          "name": "filter-redirector"
-+        },
-+        {
-+          "name": "filter-replay"
-+        },
-+        {
-+          "name": "filter-rewriter"
-+        },
-+        {
-+          "name": "input-barrier"
-+        },
-+        {
-+          "name": "input-linux"
-+        },
-+        {
-+          "name": "iommufd"
-+        },
-+        {
-+          "name": "iothread"
-+        },
-+        {
-+          "name": "main-loop"
-+        },
-+        {
-+          "name": "memory-backend-epc"
-+        },
-+        {
-+          "name": "memory-backend-file"
-+        },
-+        {
-+          "name": "memory-backend-memfd"
-+        },
-+        {
-+          "name": "memory-backend-ram"
-+        },
-+        {
-+          "name": "memory-backend-shm"
-+        },
-+        {
-+          "name": "pef-guest"
-+        },
-+        {
-+          "name": "pr-manager-helper"
-+        },
-+        {
-+          "name": "qtest"
-+        },
-+        {
-+          "name": "rng-builtin"
-+        },
-+        {
-+          "name": "rng-egd"
-+        },
-+        {
-+          "name": "rng-random"
-+        },
-+        {
-+          "name": "secret"
-+        },
-+        {
-+          "name": "secret_keyring"
-+        },
-+        {
-+          "name": "sev-guest"
-+        },
-+        {
-+          "name": "sev-snp-guest"
-+        },
-+        {
-+          "name": "thread-context"
-+        },
-+        {
-+          "name": "s390-pv-guest"
-+        },
-+        {
-+          "name": "throttle-group"
-+        },
-+        {
-+          "name": "tls-creds-anon"
-+        },
-+        {
-+          "name": "tls-creds-psk"
-+        },
-+        {
-+          "name": "tls-creds-x509"
-+        },
-+        {
-+          "name": "tls-cipher-suites"
-+        },
-+        {
-+          "name": "x-remote-object",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-vfio-user-server",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "acpi-generic-initiator",
-+        "acpi-generic-port",
-+        "authz-list",
-+        "authz-listfile",
-+        "authz-pam",
-+        "authz-simple",
-+        "can-bus",
-+        "can-host-socketcan",
-+        "colo-compare",
-+        "cryptodev-backend",
-+        "cryptodev-backend-builtin",
-+        "cryptodev-backend-lkcf",
-+        "cryptodev-vhost-user",
-+        "dbus-vmstate",
-+        "filter-buffer",
-+        "filter-dump",
-+        "filter-mirror",
-+        "filter-redirector",
-+        "filter-replay",
-+        "filter-rewriter",
-+        "input-barrier",
-+        "input-linux",
-+        "iommufd",
-+        "iothread",
-+        "main-loop",
-+        "memory-backend-epc",
-+        "memory-backend-file",
-+        "memory-backend-memfd",
-+        "memory-backend-ram",
-+        "memory-backend-shm",
-+        "pef-guest",
-+        "pr-manager-helper",
-+        "qtest",
-+        "rng-builtin",
-+        "rng-egd",
-+        "rng-random",
-+        "secret",
-+        "secret_keyring",
-+        "sev-guest",
-+        "sev-snp-guest",
-+        "thread-context",
-+        "s390-pv-guest",
-+        "throttle-group",
-+        "tls-creds-anon",
-+        "tls-creds-psk",
-+        "tls-creds-x509",
-+        "tls-cipher-suites",
-+        "x-remote-object",
-+        "x-vfio-user-server"
-+      ]
-+    },
-+    {
-+      "name": "459",
-+      "members": [
-+        {
-+          "name": "pci-dev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "460",
-+      "members": [
-+        {
-+          "name": "pci-bus",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "461",
-+      "members": [
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "676"
-+        },
-+        {
-+          "name": "rules",
-+          "default": null,
-+          "type": "[677]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "462",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "refresh",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "463",
-+      "members": [
-+        {
-+          "name": "service",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "464",
-+      "members": [
-+        {
-+          "name": "identity",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "465",
-+      "members": [
-+        {
-+          "name": "if",
-+          "type": "str"
-+        },
-+        {
-+          "name": "canbus",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "466",
-+      "members": [
-+        {
-+          "name": "primary_in",
-+          "type": "str"
-+        },
-+        {
-+          "name": "secondary_in",
-+          "type": "str"
-+        },
-+        {
-+          "name": "outdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "iothread",
-+          "type": "str"
-+        },
-+        {
-+          "name": "notify_dev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "compare_timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "expired_scan_cycle",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max_queue_size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "vnet_hdr_support",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "467",
-+      "members": [
-+        {
-+          "name": "queues",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-bps",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-ops",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "468",
-+      "members": [
-+        {
-+          "name": "queues",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-bps",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-ops",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "469",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id-list",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "470",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "678"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "679"
-+        },
-+        {
-+          "name": "interval",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "471",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "678"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "679"
-+        },
-+        {
-+          "name": "file",
-+          "type": "str"
-+        },
-+        {
-+          "name": "maxlen",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "472",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "678"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "679"
-+        },
-+        {
-+          "name": "outdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vnet_hdr_support",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "473",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "678"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "679"
-+        },
-+        {
-+          "name": "indev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "outdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vnet_hdr_support",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "474",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "678"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "679"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "475",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "678"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "679"
-+        },
-+        {
-+          "name": "vnet_hdr_support",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "476",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "x-origin",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "y-origin",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "width",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "height",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "477",
-+      "members": [
-+        {
-+          "name": "evdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "grab_all",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "repeat",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "grab-toggle",
-+          "default": null,
-+          "type": "680"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "478",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "479",
-+      "members": [
-+        {
-+          "name": "aio-max-batch",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-pool-min",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-pool-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-max-ns",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-grow",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-shrink",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "480",
-+      "members": [
-+        {
-+          "name": "aio-max-batch",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-pool-min",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-pool-max",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "481",
-+      "members": [
-+        {
-+          "name": "dump",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "merge",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "507"
-+        },
-+        {
-+          "name": "prealloc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-context",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-use-canonical-path-for-ramblock-id",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "482",
-+      "members": [
-+        {
-+          "name": "dump",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "merge",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "507"
-+        },
-+        {
-+          "name": "prealloc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-context",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-use-canonical-path-for-ramblock-id",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "align",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "discard-data",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "mem-path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "pmem",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "readonly",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "rom",
-+          "default": null,
-+          "type": "587"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "483",
-+      "members": [
-+        {
-+          "name": "dump",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "merge",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "507"
-+        },
-+        {
-+          "name": "prealloc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-context",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-use-canonical-path-for-ramblock-id",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "hugetlb",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "hugetlbsize",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "seal",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "484",
-+      "members": [
-+        {
-+          "name": "dump",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "merge",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "507"
-+        },
-+        {
-+          "name": "prealloc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-context",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-use-canonical-path-for-ramblock-id",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "485",
-+      "members": [
-+        {
-+          "name": "dump",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "merge",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "507"
-+        },
-+        {
-+          "name": "prealloc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-context",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-use-canonical-path-for-ramblock-id",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "486",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "487",
-+      "members": [
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "log",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "488",
-+      "members": [
-+        {
-+          "name": "opened",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "deprecated"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "489",
-+      "members": [
-+        {
-+          "name": "opened",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "490",
-+      "members": [
-+        {
-+          "name": "opened",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "filename",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "491",
-+      "members": [
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "681"
-+        },
-+        {
-+          "name": "keyid",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "iv",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "data",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "file",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "492",
-+      "members": [
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "681"
-+        },
-+        {
-+          "name": "keyid",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "iv",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "serial",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "493",
-+      "members": [
-+        {
-+          "name": "sev-device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cbitpos",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "reduced-phys-bits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "kernel-hashes",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dh-cert-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "session-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "handle",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "legacy-vm-type",
-+          "default": null,
-+          "type": "587"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "494",
-+      "members": [
-+        {
-+          "name": "sev-device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cbitpos",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "reduced-phys-bits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "kernel-hashes",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "guest-visible-workarounds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id-block",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id-auth",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "author-key-enabled",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-data",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vcek-disabled",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "495",
-+      "members": [
-+        {
-+          "name": "cpu-affinity",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "node-affinity",
-+          "default": null,
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "496",
-+      "members": [
-+        {
-+          "name": "limits",
-+          "default": null,
-+          "type": "682"
-+        },
-+        {
-+          "name": "x-iops-total",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-total-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-total-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-read",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-read-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-read-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-write",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-write-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-write-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-total",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-total-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-total-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-read",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-read-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-read-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-write",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-write-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-write-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-size",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "497",
-+      "members": [
-+        {
-+          "name": "verify-peer",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dir",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "endpoint",
-+          "default": null,
-+          "type": "683"
-+        },
-+        {
-+          "name": "priority",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "498",
-+      "members": [
-+        {
-+          "name": "verify-peer",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dir",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "endpoint",
-+          "default": null,
-+          "type": "683"
-+        },
-+        {
-+          "name": "priority",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "username",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "499",
-+      "members": [
-+        {
-+          "name": "verify-peer",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dir",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "endpoint",
-+          "default": null,
-+          "type": "683"
-+        },
-+        {
-+          "name": "priority",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sanity-check",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "passwordid",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "500",
-+      "members": [
-+        {
-+          "name": "verify-peer",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dir",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "endpoint",
-+          "default": null,
-+          "type": "683"
-+        },
-+        {
-+          "name": "priority",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "501",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "type": "str"
-+        },
-+        {
-+          "name": "devid",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "502",
-+      "members": [
-+        {
-+          "name": "socket",
-+          "type": "391"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "503",
-+      "members": [
-+        {
-+          "name": "node-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "drawer-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "book-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "socket-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "die-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "module-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "core-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-id",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "504",
-+      "members": [
-+        {
-+          "name": "aarch64"
-+        },
-+        {
-+          "name": "alpha"
-+        },
-+        {
-+          "name": "arm"
-+        },
-+        {
-+          "name": "avr"
-+        },
-+        {
-+          "name": "hppa"
-+        },
-+        {
-+          "name": "i386"
-+        },
-+        {
-+          "name": "loongarch64"
-+        },
-+        {
-+          "name": "m68k"
-+        },
-+        {
-+          "name": "microblaze"
-+        },
-+        {
-+          "name": "microblazeel"
-+        },
-+        {
-+          "name": "mips"
-+        },
-+        {
-+          "name": "mips64"
-+        },
-+        {
-+          "name": "mips64el"
-+        },
-+        {
-+          "name": "mipsel"
-+        },
-+        {
-+          "name": "or1k"
-+        },
-+        {
-+          "name": "ppc"
-+        },
-+        {
-+          "name": "ppc64"
-+        },
-+        {
-+          "name": "riscv32"
-+        },
-+        {
-+          "name": "riscv64"
-+        },
-+        {
-+          "name": "rx"
-+        },
-+        {
-+          "name": "s390x"
-+        },
-+        {
-+          "name": "sh4"
-+        },
-+        {
-+          "name": "sh4eb"
-+        },
-+        {
-+          "name": "sparc"
-+        },
-+        {
-+          "name": "sparc64"
-+        },
-+        {
-+          "name": "tricore"
-+        },
-+        {
-+          "name": "x86_64"
-+        },
-+        {
-+          "name": "xtensa"
-+        },
-+        {
-+          "name": "xtensaeb"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "aarch64",
-+        "alpha",
-+        "arm",
-+        "avr",
-+        "hppa",
-+        "i386",
-+        "loongarch64",
-+        "m68k",
-+        "microblaze",
-+        "microblazeel",
-+        "mips",
-+        "mips64",
-+        "mips64el",
-+        "mipsel",
-+        "or1k",
-+        "ppc",
-+        "ppc64",
-+        "riscv32",
-+        "riscv64",
-+        "rx",
-+        "s390x",
-+        "sh4",
-+        "sh4eb",
-+        "sparc",
-+        "sparc64",
-+        "tricore",
-+        "x86_64",
-+        "xtensa",
-+        "xtensaeb"
-+      ]
-+    },
-+    {
-+      "name": "505",
-+      "members": [
-+        {
-+          "name": "cpu-state",
-+          "type": "684"
-+        },
-+        {
-+          "name": "dedicated",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "entitlement",
-+          "default": null,
-+          "type": "523"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[506]",
-+      "element-type": "506",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "506",
-+      "members": [
-+        {
-+          "name": "qom-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        },
-+        {
-+          "name": "value",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "507",
-+      "members": [
-+        {
-+          "name": "default"
-+        },
-+        {
-+          "name": "preferred"
-+        },
-+        {
-+          "name": "bind"
-+        },
-+        {
-+          "name": "interleave"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "default",
-+        "preferred",
-+        "bind",
-+        "interleave"
-+      ]
-+    },
-+    {
-+      "name": "508",
-+      "members": [
-+        {
-+          "name": "node"
-+        },
-+        {
-+          "name": "dist"
-+        },
-+        {
-+          "name": "cpu"
-+        },
-+        {
-+          "name": "hmat-lb"
-+        },
-+        {
-+          "name": "hmat-cache"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "node",
-+        "dist",
-+        "cpu",
-+        "hmat-lb",
-+        "hmat-cache"
-+      ]
-+    },
-+    {
-+      "name": "509",
-+      "members": [
-+        {
-+          "name": "nodeid",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpus",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "mem",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "initiator",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "510",
-+      "members": [
-+        {
-+          "name": "src",
-+          "type": "int"
-+        },
-+        {
-+          "name": "dst",
-+          "type": "int"
-+        },
-+        {
-+          "name": "val",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "511",
-+      "members": [
-+        {
-+          "name": "node-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "drawer-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "book-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "socket-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "die-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "module-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "core-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-id",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "512",
-+      "members": [
-+        {
-+          "name": "initiator",
-+          "type": "int"
-+        },
-+        {
-+          "name": "target",
-+          "type": "int"
-+        },
-+        {
-+          "name": "hierarchy",
-+          "type": "685"
-+        },
-+        {
-+          "name": "data-type",
-+          "type": "686"
-+        },
-+        {
-+          "name": "latency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bandwidth",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "513",
-+      "members": [
-+        {
-+          "name": "node-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "level",
-+          "type": "int"
-+        },
-+        {
-+          "name": "associativity",
-+          "type": "687"
-+        },
-+        {
-+          "name": "policy",
-+          "type": "688"
-+        },
-+        {
-+          "name": "line",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "514",
-+      "members": [
-+        {
-+          "name": "dimm"
-+        },
-+        {
-+          "name": "nvdimm"
-+        },
-+        {
-+          "name": "virtio-pmem"
-+        },
-+        {
-+          "name": "virtio-mem"
-+        },
-+        {
-+          "name": "sgx-epc"
-+        },
-+        {
-+          "name": "hv-balloon"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "dimm",
-+        "nvdimm",
-+        "virtio-pmem",
-+        "virtio-mem",
-+        "sgx-epc",
-+        "hv-balloon"
-+      ]
-+    },
-+    {
-+      "name": "515",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "689"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "516",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "690"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "517",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "691"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "518",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "692"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "519",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "693"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "520",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "521",
-+      "members": [
-+        {
-+          "name": "incompatible"
-+        },
-+        {
-+          "name": "identical"
-+        },
-+        {
-+          "name": "superset"
-+        },
-+        {
-+          "name": "subset"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "incompatible",
-+        "identical",
-+        "superset",
-+        "subset"
-+      ]
-+    },
-+    {
-+      "name": "522",
-+      "members": [
-+        {
-+          "name": "static"
-+        },
-+        {
-+          "name": "full"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "static",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "523",
-+      "members": [
-+        {
-+          "name": "auto"
-+        },
-+        {
-+          "name": "low"
-+        },
-+        {
-+          "name": "medium"
-+        },
-+        {
-+          "name": "high"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "auto",
-+        "low",
-+        "medium",
-+        "high"
-+      ]
-+    },
-+    {
-+      "name": "525",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "record"
-+        },
-+        {
-+          "name": "play"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "record",
-+        "play"
-+      ]
-+    },
-+    {
-+      "name": "526",
-+      "members": [
-+        {
-+          "name": "block-node"
-+        },
-+        {
-+          "name": "chardev"
-+        },
-+        {
-+          "name": "migration"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "block-node",
-+        "chardev",
-+        "migration"
-+      ]
-+    },
-+    {
-+      "name": "527",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "528",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[529]",
-+      "element-type": "529",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "529",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[530]",
-+      "element-type": "530",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "530",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "694"
-+        },
-+        {
-+          "name": "help",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "default",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "531",
-+      "members": [
-+        {
-+          "name": "uninit"
-+        },
-+        {
-+          "name": "launch-update"
-+        },
-+        {
-+          "name": "launch-secret"
-+        },
-+        {
-+          "name": "running"
-+        },
-+        {
-+          "name": "send-update"
-+        },
-+        {
-+          "name": "receive-update"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "uninit",
-+        "launch-update",
-+        "launch-secret",
-+        "running",
-+        "send-update",
-+        "receive-update"
-+      ]
-+    },
-+    {
-+      "name": "532",
-+      "members": [
-+        {
-+          "name": "sev"
-+        },
-+        {
-+          "name": "sev-snp"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "sev",
-+        "sev-snp"
-+      ]
-+    },
-+    {
-+      "name": "533",
-+      "members": [
-+        {
-+          "name": "policy",
-+          "type": "int"
-+        },
-+        {
-+          "name": "handle",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "534",
-+      "members": [
-+        {
-+          "name": "snp-policy",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[535]",
-+      "element-type": "535",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "535",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "536",
-+      "members": [
-+        {
-+          "name": "closed"
-+        },
-+        {
-+          "name": "unbound"
-+        },
-+        {
-+          "name": "interdomain"
-+        },
-+        {
-+          "name": "pirq"
-+        },
-+        {
-+          "name": "virq"
-+        },
-+        {
-+          "name": "ipi"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "closed",
-+        "unbound",
-+        "interdomain",
-+        "pirq",
-+        "virq",
-+        "ipi"
-+      ]
-+    },
-+    {
-+      "name": "537",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "alsa"
-+        },
-+        {
-+          "name": "dbus"
-+        },
-+        {
-+          "name": "oss"
-+        },
-+        {
-+          "name": "pa"
-+        },
-+        {
-+          "name": "sdl"
-+        },
-+        {
-+          "name": "spice"
-+        },
-+        {
-+          "name": "wav"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "alsa",
-+        "dbus",
-+        "oss",
-+        "pa",
-+        "sdl",
-+        "spice",
-+        "wav"
-+      ]
-+    },
-+    {
-+      "name": "538",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "695"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "695"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "539",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "696"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "696"
-+        },
-+        {
-+          "name": "threshold",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "540",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "697"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "697"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "541",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "695"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "695"
-+        },
-+        {
-+          "name": "nsamples",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "542",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "695"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "695"
-+        },
-+        {
-+          "name": "latency",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "543",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "698"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "698"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "544",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "699"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "699"
-+        },
-+        {
-+          "name": "try-mmap",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "exclusive",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dsp-policy",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "545",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "700"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "700"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "546",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "701"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "701"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "547",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "702"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "702"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "548",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "695"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "695"
-+        },
-+        {
-+          "name": "dev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "latency",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "549",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "695"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "695"
-+        },
-+        {
-+          "name": "path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "550",
-+      "members": [
-+        {
-+          "name": "DIMM"
-+        },
-+        {
-+          "name": "CPU"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "DIMM",
-+        "CPU"
-+      ]
-+    },
-+    {
-+      "name": "[551]",
-+      "element-type": "551",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "551",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "int"
-+        },
-+        {
-+          "name": "function",
-+          "type": "int"
-+        },
-+        {
-+          "name": "class_info",
-+          "type": "703"
-+        },
-+        {
-+          "name": "id",
-+          "type": "704"
-+        },
-+        {
-+          "name": "irq",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "irq_pin",
-+          "type": "int"
-+        },
-+        {
-+          "name": "qdev_id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "pci_bridge",
-+          "default": null,
-+          "type": "705"
-+        },
-+        {
-+          "name": "regions",
-+          "type": "[706]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "552",
-+      "members": [
-+        {
-+          "name": "vm"
-+        },
-+        {
-+          "name": "vcpu"
-+        },
-+        {
-+          "name": "cryptodev"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "vm",
-+        "vcpu",
-+        "cryptodev"
-+      ]
-+    },
-+    {
-+      "name": "[553]",
-+      "element-type": "553",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "553",
-+      "members": [
-+        {
-+          "name": "provider",
-+          "type": "555"
-+        },
-+        {
-+          "name": "names",
-+          "default": null,
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "554",
-+      "members": [
-+        {
-+          "name": "vcpus",
-+          "default": null,
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "555",
-+      "members": [
-+        {
-+          "name": "kvm"
-+        },
-+        {
-+          "name": "cryptodev"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "kvm",
-+        "cryptodev"
-+      ]
-+    },
-+    {
-+      "name": "[556]",
-+      "element-type": "556",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "556",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "value",
-+          "type": "707"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[557]",
-+      "element-type": "557",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "557",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "708"
-+        },
-+        {
-+          "name": "unit",
-+          "default": null,
-+          "type": "709"
-+        },
-+        {
-+          "name": "base",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "exponent",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bucket-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "558",
-+      "members": [
-+        {
-+          "name": "transports",
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "dev-features",
-+          "default": null,
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "unknown-dev-features",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "559",
-+      "members": [
-+        {
-+          "name": "statuses",
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "unknown-statuses",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "560",
-+      "members": [
-+        {
-+          "name": "n-mem-sections",
-+          "type": "int"
-+        },
-+        {
-+          "name": "n-tmp-sections",
-+          "type": "int"
-+        },
-+        {
-+          "name": "nvqs",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vq-index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "features",
-+          "type": "558"
-+        },
-+        {
-+          "name": "acked-features",
-+          "type": "558"
-+        },
-+        {
-+          "name": "backend-features",
-+          "type": "558"
-+        },
-+        {
-+          "name": "protocol-features",
-+          "type": "710"
-+        },
-+        {
-+          "name": "max-queues",
-+          "type": "int"
-+        },
-+        {
-+          "name": "backend-cap",
-+          "type": "int"
-+        },
-+        {
-+          "name": "log-enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "log-size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[561]",
-+      "element-type": "561",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "561",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flags",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "562",
-+      "members": [
-+        {
-+          "name": "flags",
-+          "type": "int"
-+        },
-+        {
-+          "name": "idx",
-+          "type": "int"
-+        },
-+        {
-+          "name": "ring",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "563",
-+      "members": [
-+        {
-+          "name": "flags",
-+          "type": "int"
-+        },
-+        {
-+          "name": "idx",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "564",
-+      "members": [
-+        {
-+          "name": "stop"
-+        },
-+        {
-+          "name": "running"
-+        },
-+        {
-+          "name": "stop-copy"
-+        },
-+        {
-+          "name": "resuming"
-+        },
-+        {
-+          "name": "running-p2p"
-+        },
-+        {
-+          "name": "pre-copy"
-+        },
-+        {
-+          "name": "pre-copy-p2p"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "stop",
-+        "running",
-+        "stop-copy",
-+        "resuming",
-+        "running-p2p",
-+        "pre-copy",
-+        "pre-copy-p2p"
-+      ]
-+    },
-+    {
-+      "name": "[565]",
-+      "element-type": "565",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "565",
-+      "members": [
-+        {
-+          "name": "cipher"
-+        },
-+        {
-+          "name": "hash"
-+        },
-+        {
-+          "name": "mac"
-+        },
-+        {
-+          "name": "aead"
-+        },
-+        {
-+          "name": "akcipher"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "cipher",
-+        "hash",
-+        "mac",
-+        "aead",
-+        "akcipher"
-+      ]
-+    },
-+    {
-+      "name": "[566]",
-+      "element-type": "566",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "566",
-+      "members": [
-+        {
-+          "name": "queue",
-+          "type": "int"
-+        },
-+        {
-+          "name": "type",
-+          "type": "711"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "567",
-+      "members": [
-+        {
-+          "name": "informational"
-+        },
-+        {
-+          "name": "warning"
-+        },
-+        {
-+          "name": "failure"
-+        },
-+        {
-+          "name": "fatal"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "informational",
-+        "warning",
-+        "failure",
-+        "fatal"
-+      ]
-+    },
-+    {
-+      "name": "[568]",
-+      "element-type": "568",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "568",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "712"
-+        },
-+        {
-+          "name": "header",
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "569",
-+      "members": [
-+        {
-+          "name": "cache-data-ecc"
-+        },
-+        {
-+          "name": "mem-data-ecc"
-+        },
-+        {
-+          "name": "crc-threshold"
-+        },
-+        {
-+          "name": "retry-threshold"
-+        },
-+        {
-+          "name": "cache-poison-received"
-+        },
-+        {
-+          "name": "mem-poison-received"
-+        },
-+        {
-+          "name": "physical"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "cache-data-ecc",
-+        "mem-data-ecc",
-+        "crc-threshold",
-+        "retry-threshold",
-+        "cache-poison-received",
-+        "mem-poison-received",
-+        "physical"
-+      ]
-+    },
-+    {
-+      "name": "570",
-+      "members": [
-+        {
-+          "name": "free"
-+        },
-+        {
-+          "name": "contiguous"
-+        },
-+        {
-+          "name": "prescriptive"
-+        },
-+        {
-+          "name": "enable-shared-access"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "free",
-+        "contiguous",
-+        "prescriptive",
-+        "enable-shared-access"
-+      ]
-+    },
-+    {
-+      "name": "[571]",
-+      "element-type": "571",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "571",
-+      "members": [
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "572",
-+      "members": [
-+        {
-+          "name": "tag-based"
-+        },
-+        {
-+          "name": "prescriptive"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "tag-based",
-+        "prescriptive"
-+      ]
-+    },
-+    {
-+      "name": "573",
-+      "members": [
-+        {
-+          "name": "hyper-v"
-+        },
-+        {
-+          "name": "s390"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "hyper-v",
-+        "s390"
-+      ]
-+    },
-+    {
-+      "name": "574",
-+      "members": [
-+        {
-+          "name": "arg1",
-+          "type": "int"
-+        },
-+        {
-+          "name": "arg2",
-+          "type": "int"
-+        },
-+        {
-+          "name": "arg3",
-+          "type": "int"
-+        },
-+        {
-+          "name": "arg4",
-+          "type": "int"
-+        },
-+        {
-+          "name": "arg5",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "575",
-+      "members": [
-+        {
-+          "name": "core",
-+          "type": "int"
-+        },
-+        {
-+          "name": "psw-mask",
-+          "type": "int"
-+        },
-+        {
-+          "name": "psw-addr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "713"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[576]",
-+      "element-type": "576",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "576",
-+      "members": [
-+        {
-+          "name": "interval_length",
-+          "type": "int"
-+        },
-+        {
-+          "name": "min_rd_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max_rd_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avg_rd_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "min_wr_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max_wr_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avg_wr_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "min_zone_append_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max_zone_append_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avg_zone_append_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "min_flush_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max_flush_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avg_flush_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avg_rd_queue_depth",
-+          "type": "number"
-+        },
-+        {
-+          "name": "avg_wr_queue_depth",
-+          "type": "number"
-+        },
-+        {
-+          "name": "avg_zone_append_queue_depth",
-+          "type": "number"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "577",
-+      "members": [
-+        {
-+          "name": "boundaries",
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "bins",
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "578",
-+      "members": [
-+        {
-+          "name": "discard-nb-ok",
-+          "type": "int"
-+        },
-+        {
-+          "name": "discard-nb-failed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "discard-bytes-ok",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "579",
-+      "members": [
-+        {
-+          "name": "completion-errors",
-+          "type": "int"
-+        },
-+        {
-+          "name": "aligned-accesses",
-+          "type": "int"
-+        },
-+        {
-+          "name": "unaligned-accesses",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[78]",
-+      "element-type": "78",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "580",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "qcow2",
-+          "type": "715"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "716"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "717"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "718"
-+        },
-+        {
-+          "case": "file",
-+          "type": "719"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "714"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "581",
-+      "members": [
-+        {
-+          "name": "block-backend"
-+        },
-+        {
-+          "name": "block-job"
-+        },
-+        {
-+          "name": "block-driver"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "block-backend",
-+        "block-job",
-+        "block-driver"
-+      ]
-+    },
-+    {
-+      "name": "[582]",
-+      "element-type": "582",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "582",
-+      "members": [
-+        {
-+          "name": "consistent-read"
-+        },
-+        {
-+          "name": "write"
-+        },
-+        {
-+          "name": "write-unchanged"
-+        },
-+        {
-+          "name": "resize"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "consistent-read",
-+        "write",
-+        "write-unchanged",
-+        "resize"
-+      ]
-+    },
-+    {
-+      "name": "583",
-+      "members": [
-+        {
-+          "type": "58"
-+        },
-+        {
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "[584]",
-+      "element-type": "584",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "584",
-+      "members": [
-+        {
-+          "name": "event",
-+          "type": "720"
-+        },
-+        {
-+          "name": "state",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iotype",
-+          "default": null,
-+          "type": "721"
-+        },
-+        {
-+          "name": "errno",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "sector",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "once",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "immediately",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[585]",
-+      "element-type": "585",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "585",
-+      "members": [
-+        {
-+          "name": "event",
-+          "type": "720"
-+        },
-+        {
-+          "name": "state",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "new_state",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "586",
-+      "members": [
-+        {
-+          "name": "break-guest-write"
-+        },
-+        {
-+          "name": "break-snapshot"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "break-guest-write",
-+        "break-snapshot"
-+      ]
-+    },
-+    {
-+      "name": "587",
-+      "members": [
-+        {
-+          "name": "auto"
-+        },
-+        {
-+          "name": "on"
-+        },
-+        {
-+          "name": "off"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "auto",
-+        "on",
-+        "off"
-+      ]
-+    },
-+    {
-+      "name": "588",
-+      "members": [
-+        {
-+          "name": "threads"
-+        },
-+        {
-+          "name": "native"
-+        },
-+        {
-+          "name": "io_uring"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "threads",
-+        "native",
-+        "io_uring"
-+      ]
-+    },
-+    {
-+      "name": "589",
-+      "members": [
-+        {
-+          "name": "tcp"
-+        },
-+        {
-+          "name": "iser"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "tcp",
-+        "iser"
-+      ]
-+    },
-+    {
-+      "name": "590",
-+      "members": [
-+        {
-+          "name": "crc32c"
-+        },
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "crc32c-none"
-+        },
-+        {
-+          "name": "none-crc32c"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "crc32c",
-+        "none",
-+        "crc32c-none",
-+        "none-crc32c"
-+      ]
-+    },
-+    {
-+      "name": "591",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "722"
-+        },
-+        {
-+          "name": "host",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "592",
-+      "members": [
-+        {
-+          "type": "58"
-+        },
-+        {
-+          "type": "str"
-+        },
-+        {
-+          "type": "null"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "593",
-+      "members": [
-+        {
-+          "type": "723"
-+        },
-+        {
-+          "type": "724"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "594",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "aes",
-+          "type": "726"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "727"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "725"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "595",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "aes",
-+          "type": "726"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "728"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[583]",
-+      "element-type": "583",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "596",
-+      "members": [
-+        {
-+          "name": "quorum"
-+        },
-+        {
-+          "name": "fifo"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "quorum",
-+        "fifo"
-+      ]
-+    },
-+    {
-+      "name": "597",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "luks",
-+          "type": "730"
-+        },
-+        {
-+          "case": "luks2",
-+          "type": "731"
-+        },
-+        {
-+          "case": "luks-any",
-+          "type": "732"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "729"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "597"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[598]",
-+      "element-type": "598",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "598",
-+      "members": [
-+        {
-+          "name": "cephx"
-+        },
-+        {
-+          "name": "none"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "cephx",
-+        "none"
-+      ]
-+    },
-+    {
-+      "name": "[599]",
-+      "element-type": "599",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "599",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "600",
-+      "members": [
-+        {
-+          "name": "primary"
-+        },
-+        {
-+          "name": "secondary"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "primary",
-+        "secondary"
-+      ]
-+    },
-+    {
-+      "name": "601",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        },
-+        {
-+          "name": "numeric",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "to",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "ipv4",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ipv6",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "keep-alive",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "mptcp",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "602",
-+      "tag": "mode",
-+      "variants": [
-+        {
-+          "case": "hash",
-+          "type": "734"
-+        },
-+        {
-+          "case": "none",
-+          "type": "0"
-+        },
-+        {
-+          "case": "known_hosts",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "mode",
-+          "type": "733"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "603",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "735"
-+        },
-+        {
-+          "name": "nocow",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "extent-size-hint",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "604",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "330"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "735"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "605",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cipher-alg",
-+          "default": null,
-+          "type": "736"
-+        },
-+        {
-+          "name": "cipher-mode",
-+          "default": null,
-+          "type": "737"
-+        },
-+        {
-+          "name": "ivgen-alg",
-+          "default": null,
-+          "type": "738"
-+        },
-+        {
-+          "name": "ivgen-hash-alg",
-+          "default": null,
-+          "type": "739"
-+        },
-+        {
-+          "name": "hash-alg",
-+          "default": null,
-+          "type": "739"
-+        },
-+        {
-+          "name": "iter-time",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "file",
-+          "default": null,
-+          "type": "583"
-+        },
-+        {
-+          "name": "header",
-+          "default": null,
-+          "type": "583"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "735"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "606",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "337"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "607",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "608",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "740"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "609",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "data-file",
-+          "default": null,
-+          "type": "583"
-+        },
-+        {
-+          "name": "data-file-raw",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "extended-l2",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "version",
-+          "default": null,
-+          "type": "741"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-fmt",
-+          "default": null,
-+          "type": "317"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "740"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "735"
-+        },
-+        {
-+          "name": "lazy-refcounts",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "refcount-bits",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "compression-type",
-+          "default": null,
-+          "type": "742"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "610",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-fmt",
-+          "default": null,
-+          "type": "317"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "table-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "611",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "347"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "743"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "612",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "349"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "613",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "735"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "614",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "log-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "subformat",
-+          "default": null,
-+          "type": "744"
-+        },
-+        {
-+          "name": "block-state-zero",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "615",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "extents",
-+          "default": null,
-+          "type": "[583]"
-+        },
-+        {
-+          "name": "subformat",
-+          "default": null,
-+          "type": "745"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "adapter-type",
-+          "default": null,
-+          "type": "746"
-+        },
-+        {
-+          "name": "hwversion",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "toolsversion",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "zeroed-grain",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "616",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "583"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "subformat",
-+          "default": null,
-+          "type": "747"
-+        },
-+        {
-+          "name": "force-size",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "617",
-+      "members": [
-+        {
-+          "name": "state",
-+          "type": "748"
-+        },
-+        {
-+          "name": "new-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "old-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "keyslot",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iter-time",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "618",
-+      "members": [
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "749"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "null",
-+      "json-type": "null",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "619",
-+      "members": [
-+        {
-+          "name": "inet"
-+        },
-+        {
-+          "name": "unix"
-+        },
-+        {
-+          "name": "vsock"
-+        },
-+        {
-+          "name": "fd"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "inet",
-+        "unix",
-+        "vsock",
-+        "fd"
-+      ]
-+    },
-+    {
-+      "name": "620",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "601"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "621",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "643"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "622",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "644"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "623",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "645"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "624",
-+      "members": [
-+        {
-+          "name": "off"
-+        },
-+        {
-+          "name": "on"
-+        },
-+        {
-+          "name": "auto"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on",
-+        "auto"
-+      ]
-+    },
-+    {
-+      "name": "625",
-+      "members": [
-+        {
-+          "name": "file"
-+        },
-+        {
-+          "name": "serial"
-+        },
-+        {
-+          "name": "parallel"
-+        },
-+        {
-+          "name": "pipe"
-+        },
-+        {
-+          "name": "socket"
-+        },
-+        {
-+          "name": "udp"
-+        },
-+        {
-+          "name": "pty"
-+        },
-+        {
-+          "name": "null"
-+        },
-+        {
-+          "name": "mux"
-+        },
-+        {
-+          "name": "hub"
-+        },
-+        {
-+          "name": "msmouse"
-+        },
-+        {
-+          "name": "wctablet"
-+        },
-+        {
-+          "name": "braille"
-+        },
-+        {
-+          "name": "testdev"
-+        },
-+        {
-+          "name": "stdio"
-+        },
-+        {
-+          "name": "spicevmc"
-+        },
-+        {
-+          "name": "spiceport"
-+        },
-+        {
-+          "name": "qemu-vdagent"
-+        },
-+        {
-+          "name": "dbus"
-+        },
-+        {
-+          "name": "vc"
-+        },
-+        {
-+          "name": "ringbuf"
-+        },
-+        {
-+          "name": "memory",
-+          "features": [
-+            "deprecated"
-+          ]
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "file",
-+        "serial",
-+        "parallel",
-+        "pipe",
-+        "socket",
-+        "udp",
-+        "pty",
-+        "null",
-+        "mux",
-+        "hub",
-+        "msmouse",
-+        "wctablet",
-+        "braille",
-+        "testdev",
-+        "stdio",
-+        "spicevmc",
-+        "spiceport",
-+        "qemu-vdagent",
-+        "dbus",
-+        "vc",
-+        "ringbuf",
-+        "memory"
-+      ]
-+    },
-+    {
-+      "name": "626",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "750"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "627",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "751"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "628",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "752"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "629",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "753"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "630",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "754"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "631",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "755"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "632",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "756"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "633",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "757"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "634",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "758"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "635",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "759"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "636",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "760"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "637",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "761"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "638",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "762"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "639",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "763"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "640",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "764"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[641]",
-+      "element-type": "641",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "641",
-+      "members": [
-+        {
-+          "name": "str",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "643",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "tight",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "644",
-+      "members": [
-+        {
-+          "name": "cid",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "645",
-+      "members": [
-+        {
-+          "name": "str",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "646",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "765"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "647",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "766"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "648",
-+      "members": [
-+        {
-+          "name": "number"
-+        },
-+        {
-+          "name": "qcode"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "number",
-+        "qcode"
-+      ]
-+    },
-+    {
-+      "name": "649",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "650",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "767"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "651",
-+      "members": [
-+        {
-+          "name": "key"
-+        },
-+        {
-+          "name": "btn"
-+        },
-+        {
-+          "name": "rel"
-+        },
-+        {
-+          "name": "abs"
-+        },
-+        {
-+          "name": "mtt"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "key",
-+        "btn",
-+        "rel",
-+        "abs",
-+        "mtt"
-+      ]
-+    },
-+    {
-+      "name": "652",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "768"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "653",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "769"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "654",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "770"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "655",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "771"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "656",
-+      "members": [
-+        {
-+          "name": "lctrl-lalt"
-+        },
-+        {
-+          "name": "lshift-lctrl-lalt"
-+        },
-+        {
-+          "name": "rctrl"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "lctrl-lalt",
-+        "lshift-lctrl-lalt",
-+        "rctrl"
-+      ]
-+    },
-+    {
-+      "name": "number",
-+      "json-type": "number",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "[657]",
-+      "element-type": "657",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "657",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "alias",
-+          "type": "str"
-+        },
-+        {
-+          "name": "transform",
-+          "default": null,
-+          "type": "772"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "658",
-+      "members": [
-+        {
-+          "name": "main"
-+        },
-+        {
-+          "name": "cpr"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "main",
-+        "cpr"
-+      ]
-+    },
-+    {
-+      "name": "659",
-+      "tag": "transport",
-+      "variants": [
-+        {
-+          "case": "socket",
-+          "type": "391"
-+        },
-+        {
-+          "case": "exec",
-+          "type": "774"
-+        },
-+        {
-+          "case": "rdma",
-+          "type": "601"
-+        },
-+        {
-+          "case": "file",
-+          "type": "775"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "transport",
-+          "type": "773"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "660",
-+      "members": [
-+        {
-+          "name": "abort"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-add"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-remove"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-clear"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-enable"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-disable"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-merge"
-+        },
-+        {
-+          "name": "blockdev-backup"
-+        },
-+        {
-+          "name": "blockdev-snapshot"
-+        },
-+        {
-+          "name": "blockdev-snapshot-internal-sync"
-+        },
-+        {
-+          "name": "blockdev-snapshot-sync"
-+        },
-+        {
-+          "name": "drive-backup",
-+          "features": [
-+            "deprecated"
-+          ]
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "abort",
-+        "block-dirty-bitmap-add",
-+        "block-dirty-bitmap-remove",
-+        "block-dirty-bitmap-clear",
-+        "block-dirty-bitmap-enable",
-+        "block-dirty-bitmap-disable",
-+        "block-dirty-bitmap-merge",
-+        "blockdev-backup",
-+        "blockdev-snapshot",
-+        "blockdev-snapshot-internal-sync",
-+        "blockdev-snapshot-sync",
-+        "drive-backup"
-+      ]
-+    },
-+    {
-+      "name": "661",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "776"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "662",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "44"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "663",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "45"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "664",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "46"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "665",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "39"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "666",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "35"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "667",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "76"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "668",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "34"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "669",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "38"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "670",
-+      "members": [
-+        {
-+          "name": "individual"
-+        },
-+        {
-+          "name": "grouped"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "individual",
-+        "grouped"
-+      ]
-+    },
-+    {
-+      "name": "671",
-+      "members": [
-+        {
-+          "name": "string"
-+        },
-+        {
-+          "name": "number"
-+        },
-+        {
-+          "name": "int"
-+        },
-+        {
-+          "name": "boolean"
-+        },
-+        {
-+          "name": "null"
-+        },
-+        {
-+          "name": "object"
-+        },
-+        {
-+          "name": "array"
-+        },
-+        {
-+          "name": "value"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "string",
-+        "number",
-+        "int",
-+        "boolean",
-+        "null",
-+        "object",
-+        "array",
-+        "value"
-+      ]
-+    },
-+    {
-+      "name": "[672]",
-+      "element-type": "672",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "672",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "features",
-+          "default": null,
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[673]",
-+      "element-type": "673",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "673",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "default",
-+          "default": null,
-+          "type": "any"
-+        },
-+        {
-+          "name": "features",
-+          "default": null,
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[674]",
-+      "element-type": "674",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "674",
-+      "members": [
-+        {
-+          "name": "case",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[675]",
-+      "element-type": "675",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "675",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "676",
-+      "members": [
-+        {
-+          "name": "deny"
-+        },
-+        {
-+          "name": "allow"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "deny",
-+        "allow"
-+      ]
-+    },
-+    {
-+      "name": "[677]",
-+      "element-type": "677",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "677",
-+      "members": [
-+        {
-+          "name": "match",
-+          "type": "str"
-+        },
-+        {
-+          "name": "policy",
-+          "type": "676"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "777"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "678",
-+      "members": [
-+        {
-+          "name": "all"
-+        },
-+        {
-+          "name": "rx"
-+        },
-+        {
-+          "name": "tx"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "all",
-+        "rx",
-+        "tx"
-+      ]
-+    },
-+    {
-+      "name": "679",
-+      "members": [
-+        {
-+          "name": "before"
-+        },
-+        {
-+          "name": "behind"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "before",
-+        "behind"
-+      ]
-+    },
-+    {
-+      "name": "680",
-+      "members": [
-+        {
-+          "name": "ctrl-ctrl"
-+        },
-+        {
-+          "name": "alt-alt"
-+        },
-+        {
-+          "name": "shift-shift"
-+        },
-+        {
-+          "name": "meta-meta"
-+        },
-+        {
-+          "name": "scrolllock"
-+        },
-+        {
-+          "name": "ctrl-scrolllock"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ctrl-ctrl",
-+        "alt-alt",
-+        "shift-shift",
-+        "meta-meta",
-+        "scrolllock",
-+        "ctrl-scrolllock"
-+      ]
-+    },
-+    {
-+      "name": "681",
-+      "members": [
-+        {
-+          "name": "raw"
-+        },
-+        {
-+          "name": "base64"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "raw",
-+        "base64"
-+      ]
-+    },
-+    {
-+      "name": "682",
-+      "members": [
-+        {
-+          "name": "iops-total",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-total-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-total-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-read",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-read-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-read-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-write",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-write-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-write-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-total",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-total-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-total-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-read",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-read-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-read-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-write",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-write-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-write-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "683",
-+      "members": [
-+        {
-+          "name": "client"
-+        },
-+        {
-+          "name": "server"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "client",
-+        "server"
-+      ]
-+    },
-+    {
-+      "name": "684",
-+      "members": [
-+        {
-+          "name": "uninitialized"
-+        },
-+        {
-+          "name": "stopped"
-+        },
-+        {
-+          "name": "check-stop"
-+        },
-+        {
-+          "name": "operating"
-+        },
-+        {
-+          "name": "load"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "uninitialized",
-+        "stopped",
-+        "check-stop",
-+        "operating",
-+        "load"
-+      ]
-+    },
-+    {
-+      "name": "685",
-+      "members": [
-+        {
-+          "name": "memory"
-+        },
-+        {
-+          "name": "first-level"
-+        },
-+        {
-+          "name": "second-level"
-+        },
-+        {
-+          "name": "third-level"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "memory",
-+        "first-level",
-+        "second-level",
-+        "third-level"
-+      ]
-+    },
-+    {
-+      "name": "686",
-+      "members": [
-+        {
-+          "name": "access-latency"
-+        },
-+        {
-+          "name": "read-latency"
-+        },
-+        {
-+          "name": "write-latency"
-+        },
-+        {
-+          "name": "access-bandwidth"
-+        },
-+        {
-+          "name": "read-bandwidth"
-+        },
-+        {
-+          "name": "write-bandwidth"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "access-latency",
-+        "read-latency",
-+        "write-latency",
-+        "access-bandwidth",
-+        "read-bandwidth",
-+        "write-bandwidth"
-+      ]
-+    },
-+    {
-+      "name": "687",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "direct"
-+        },
-+        {
-+          "name": "complex"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "direct",
-+        "complex"
-+      ]
-+    },
-+    {
-+      "name": "688",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "write-back"
-+        },
-+        {
-+          "name": "write-through"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "write-back",
-+        "write-through"
-+      ]
-+    },
-+    {
-+      "name": "689",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "addr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "int"
-+        },
-+        {
-+          "name": "node",
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "hotplugged",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "hotpluggable",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "690",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "memaddr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "691",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "memaddr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "requested-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "node",
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "692",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "memaddr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "node",
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "693",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "memaddr",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "694",
-+      "members": [
-+        {
-+          "name": "string"
-+        },
-+        {
-+          "name": "boolean"
-+        },
-+        {
-+          "name": "number"
-+        },
-+        {
-+          "name": "size"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "string",
-+        "boolean",
-+        "number",
-+        "size"
-+      ]
-+    },
-+    {
-+      "name": "695",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "778"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "696",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "778"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "dev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "period-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "try-poll",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "697",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "778"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "buffer-count",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "698",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "778"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "server-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "client-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "connect-ports",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "start-server",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "exact-name",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "699",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "778"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "dev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "buffer-count",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "try-poll",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "700",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "778"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "stream-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "latency",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "701",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "778"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "stream-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "latency",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "702",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "778"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "buffer-count",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "703",
-+      "members": [
-+        {
-+          "name": "desc",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "class",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "704",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vendor",
-+          "type": "int"
-+        },
-+        {
-+          "name": "subsystem",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "subsystem-vendor",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "705",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "779"
-+        },
-+        {
-+          "name": "devices",
-+          "default": null,
-+          "type": "[551]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[706]",
-+      "element-type": "706",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "706",
-+      "members": [
-+        {
-+          "name": "bar",
-+          "type": "int"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "address",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "prefetch",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "mem_type_64",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "707",
-+      "members": [
-+        {
-+          "type": "int"
-+        },
-+        {
-+          "type": "bool"
-+        },
-+        {
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "708",
-+      "members": [
-+        {
-+          "name": "cumulative"
-+        },
-+        {
-+          "name": "instant"
-+        },
-+        {
-+          "name": "peak"
-+        },
-+        {
-+          "name": "linear-histogram"
-+        },
-+        {
-+          "name": "log2-histogram"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "cumulative",
-+        "instant",
-+        "peak",
-+        "linear-histogram",
-+        "log2-histogram"
-+      ]
-+    },
-+    {
-+      "name": "709",
-+      "members": [
-+        {
-+          "name": "bytes"
-+        },
-+        {
-+          "name": "seconds"
-+        },
-+        {
-+          "name": "cycles"
-+        },
-+        {
-+          "name": "boolean"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "bytes",
-+        "seconds",
-+        "cycles",
-+        "boolean"
-+      ]
-+    },
-+    {
-+      "name": "710",
-+      "members": [
-+        {
-+          "name": "protocols",
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "unknown-protocols",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "711",
-+      "members": [
-+        {
-+          "name": "builtin"
-+        },
-+        {
-+          "name": "vhost-user"
-+        },
-+        {
-+          "name": "lkcf"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "builtin",
-+        "vhost-user",
-+        "lkcf"
-+      ]
-+    },
-+    {
-+      "name": "712",
-+      "members": [
-+        {
-+          "name": "cache-data-parity"
-+        },
-+        {
-+          "name": "cache-address-parity"
-+        },
-+        {
-+          "name": "cache-be-parity"
-+        },
-+        {
-+          "name": "cache-data-ecc"
-+        },
-+        {
-+          "name": "mem-data-parity"
-+        },
-+        {
-+          "name": "mem-address-parity"
-+        },
-+        {
-+          "name": "mem-be-parity"
-+        },
-+        {
-+          "name": "mem-data-ecc"
-+        },
-+        {
-+          "name": "reinit-threshold"
-+        },
-+        {
-+          "name": "rsvd-encoding"
-+        },
-+        {
-+          "name": "poison-received"
-+        },
-+        {
-+          "name": "receiver-overflow"
-+        },
-+        {
-+          "name": "internal"
-+        },
-+        {
-+          "name": "cxl-ide-tx"
-+        },
-+        {
-+          "name": "cxl-ide-rx"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "cache-data-parity",
-+        "cache-address-parity",
-+        "cache-be-parity",
-+        "cache-data-ecc",
-+        "mem-data-parity",
-+        "mem-address-parity",
-+        "mem-be-parity",
-+        "mem-data-ecc",
-+        "reinit-threshold",
-+        "rsvd-encoding",
-+        "poison-received",
-+        "receiver-overflow",
-+        "internal",
-+        "cxl-ide-tx",
-+        "cxl-ide-rx"
-+      ]
-+    },
-+    {
-+      "name": "713",
-+      "members": [
-+        {
-+          "name": "unknown"
-+        },
-+        {
-+          "name": "disabled-wait"
-+        },
-+        {
-+          "name": "extint-loop"
-+        },
-+        {
-+          "name": "pgmint-loop"
-+        },
-+        {
-+          "name": "opint-loop"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "unknown",
-+        "disabled-wait",
-+        "extint-loop",
-+        "pgmint-loop",
-+        "opint-loop"
-+      ]
-+    },
-+    {
-+      "name": "714",
-+      "members": [
-+        {
-+          "name": "qcow2"
-+        },
-+        {
-+          "name": "vmdk"
-+        },
-+        {
-+          "name": "luks"
-+        },
-+        {
-+          "name": "rbd"
-+        },
-+        {
-+          "name": "file"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "qcow2",
-+        "vmdk",
-+        "luks",
-+        "rbd",
-+        "file"
-+      ]
-+    },
-+    {
-+      "name": "715",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "780"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "716",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "781"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "717",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "782"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "718",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "783"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "719",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "784"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "720",
-+      "members": [
-+        {
-+          "name": "l1_update"
-+        },
-+        {
-+          "name": "l1_grow_alloc_table"
-+        },
-+        {
-+          "name": "l1_grow_write_table"
-+        },
-+        {
-+          "name": "l1_grow_activate_table"
-+        },
-+        {
-+          "name": "l2_load"
-+        },
-+        {
-+          "name": "l2_update"
-+        },
-+        {
-+          "name": "l2_update_compressed"
-+        },
-+        {
-+          "name": "l2_alloc_cow_read"
-+        },
-+        {
-+          "name": "l2_alloc_write"
-+        },
-+        {
-+          "name": "read_aio"
-+        },
-+        {
-+          "name": "read_backing_aio"
-+        },
-+        {
-+          "name": "read_compressed"
-+        },
-+        {
-+          "name": "write_aio"
-+        },
-+        {
-+          "name": "write_compressed"
-+        },
-+        {
-+          "name": "vmstate_load"
-+        },
-+        {
-+          "name": "vmstate_save"
-+        },
-+        {
-+          "name": "cow_read"
-+        },
-+        {
-+          "name": "cow_write"
-+        },
-+        {
-+          "name": "reftable_load"
-+        },
-+        {
-+          "name": "reftable_grow"
-+        },
-+        {
-+          "name": "reftable_update"
-+        },
-+        {
-+          "name": "refblock_load"
-+        },
-+        {
-+          "name": "refblock_update"
-+        },
-+        {
-+          "name": "refblock_update_part"
-+        },
-+        {
-+          "name": "refblock_alloc"
-+        },
-+        {
-+          "name": "refblock_alloc_hookup"
-+        },
-+        {
-+          "name": "refblock_alloc_write"
-+        },
-+        {
-+          "name": "refblock_alloc_write_blocks"
-+        },
-+        {
-+          "name": "refblock_alloc_write_table"
-+        },
-+        {
-+          "name": "refblock_alloc_switch_table"
-+        },
-+        {
-+          "name": "cluster_alloc"
-+        },
-+        {
-+          "name": "cluster_alloc_bytes"
-+        },
-+        {
-+          "name": "cluster_free"
-+        },
-+        {
-+          "name": "flush_to_os"
-+        },
-+        {
-+          "name": "flush_to_disk"
-+        },
-+        {
-+          "name": "pwritev_rmw_head"
-+        },
-+        {
-+          "name": "pwritev_rmw_after_head"
-+        },
-+        {
-+          "name": "pwritev_rmw_tail"
-+        },
-+        {
-+          "name": "pwritev_rmw_after_tail"
-+        },
-+        {
-+          "name": "pwritev"
-+        },
-+        {
-+          "name": "pwritev_zero"
-+        },
-+        {
-+          "name": "pwritev_done"
-+        },
-+        {
-+          "name": "empty_image_prepare"
-+        },
-+        {
-+          "name": "l1_shrink_write_table"
-+        },
-+        {
-+          "name": "l1_shrink_free_l2_clusters"
-+        },
-+        {
-+          "name": "cor_write"
-+        },
-+        {
-+          "name": "cluster_alloc_space"
-+        },
-+        {
-+          "name": "none"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "l1_update",
-+        "l1_grow_alloc_table",
-+        "l1_grow_write_table",
-+        "l1_grow_activate_table",
-+        "l2_load",
-+        "l2_update",
-+        "l2_update_compressed",
-+        "l2_alloc_cow_read",
-+        "l2_alloc_write",
-+        "read_aio",
-+        "read_backing_aio",
-+        "read_compressed",
-+        "write_aio",
-+        "write_compressed",
-+        "vmstate_load",
-+        "vmstate_save",
-+        "cow_read",
-+        "cow_write",
-+        "reftable_load",
-+        "reftable_grow",
-+        "reftable_update",
-+        "refblock_load",
-+        "refblock_update",
-+        "refblock_update_part",
-+        "refblock_alloc",
-+        "refblock_alloc_hookup",
-+        "refblock_alloc_write",
-+        "refblock_alloc_write_blocks",
-+        "refblock_alloc_write_table",
-+        "refblock_alloc_switch_table",
-+        "cluster_alloc",
-+        "cluster_alloc_bytes",
-+        "cluster_free",
-+        "flush_to_os",
-+        "flush_to_disk",
-+        "pwritev_rmw_head",
-+        "pwritev_rmw_after_head",
-+        "pwritev_rmw_tail",
-+        "pwritev_rmw_after_tail",
-+        "pwritev",
-+        "pwritev_zero",
-+        "pwritev_done",
-+        "empty_image_prepare",
-+        "l1_shrink_write_table",
-+        "l1_shrink_free_l2_clusters",
-+        "cor_write",
-+        "cluster_alloc_space",
-+        "none"
-+      ]
-+    },
-+    {
-+      "name": "721",
-+      "members": [
-+        {
-+          "name": "read"
-+        },
-+        {
-+          "name": "write"
-+        },
-+        {
-+          "name": "write-zeroes"
-+        },
-+        {
-+          "name": "discard"
-+        },
-+        {
-+          "name": "flush"
-+        },
-+        {
-+          "name": "block-status"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "read",
-+        "write",
-+        "write-zeroes",
-+        "discard",
-+        "flush",
-+        "block-status"
-+      ]
-+    },
-+    {
-+      "name": "722",
-+      "members": [
-+        {
-+          "name": "inet"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "inet"
-+      ]
-+    },
-+    {
-+      "name": "723",
-+      "members": [
-+        {
-+          "name": "template",
-+          "default": null,
-+          "type": "724"
-+        },
-+        {
-+          "name": "main-header",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "active-l1",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "active-l2",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "refcount-table",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "refcount-block",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "snapshot-table",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "inactive-l1",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "inactive-l2",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "bitmap-directory",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "724",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "constant"
-+        },
-+        {
-+          "name": "cached"
-+        },
-+        {
-+          "name": "all"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "constant",
-+        "cached",
-+        "all"
-+      ]
-+    },
-+    {
-+      "name": "725",
-+      "members": [
-+        {
-+          "name": "aes"
-+        },
-+        {
-+          "name": "luks"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "aes",
-+        "luks"
-+      ]
-+    },
-+    {
-+      "name": "726",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "727",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "728",
-+      "members": [
-+        {
-+          "name": "aes"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "aes"
-+      ]
-+    },
-+    {
-+      "name": "729",
-+      "members": [
-+        {
-+          "name": "luks"
-+        },
-+        {
-+          "name": "luks2"
-+        },
-+        {
-+          "name": "luks-any"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "luks",
-+        "luks2",
-+        "luks-any"
-+      ]
-+    },
-+    {
-+      "name": "730",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "731",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "732",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "733",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "hash"
-+        },
-+        {
-+          "name": "known_hosts"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "hash",
-+        "known_hosts"
-+      ]
-+    },
-+    {
-+      "name": "734",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "785"
-+        },
-+        {
-+          "name": "hash",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "735",
-+      "members": [
-+        {
-+          "name": "off"
-+        },
-+        {
-+          "name": "metadata"
-+        },
-+        {
-+          "name": "falloc"
-+        },
-+        {
-+          "name": "full"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "metadata",
-+        "falloc",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "736",
-+      "members": [
-+        {
-+          "name": "aes-128"
-+        },
-+        {
-+          "name": "aes-192"
-+        },
-+        {
-+          "name": "aes-256"
-+        },
-+        {
-+          "name": "des"
-+        },
-+        {
-+          "name": "3des"
-+        },
-+        {
-+          "name": "cast5-128"
-+        },
-+        {
-+          "name": "serpent-128"
-+        },
-+        {
-+          "name": "serpent-192"
-+        },
-+        {
-+          "name": "serpent-256"
-+        },
-+        {
-+          "name": "twofish-128"
-+        },
-+        {
-+          "name": "twofish-192"
-+        },
-+        {
-+          "name": "twofish-256"
-+        },
-+        {
-+          "name": "sm4"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "aes-128",
-+        "aes-192",
-+        "aes-256",
-+        "des",
-+        "3des",
-+        "cast5-128",
-+        "serpent-128",
-+        "serpent-192",
-+        "serpent-256",
-+        "twofish-128",
-+        "twofish-192",
-+        "twofish-256",
-+        "sm4"
-+      ]
-+    },
-+    {
-+      "name": "737",
-+      "members": [
-+        {
-+          "name": "ecb"
-+        },
-+        {
-+          "name": "cbc"
-+        },
-+        {
-+          "name": "xts"
-+        },
-+        {
-+          "name": "ctr"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ecb",
-+        "cbc",
-+        "xts",
-+        "ctr"
-+      ]
-+    },
-+    {
-+      "name": "738",
-+      "members": [
-+        {
-+          "name": "plain"
-+        },
-+        {
-+          "name": "plain64"
-+        },
-+        {
-+          "name": "essiv"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "plain",
-+        "plain64",
-+        "essiv"
-+      ]
-+    },
-+    {
-+      "name": "739",
-+      "members": [
-+        {
-+          "name": "md5"
-+        },
-+        {
-+          "name": "sha1"
-+        },
-+        {
-+          "name": "sha224"
-+        },
-+        {
-+          "name": "sha256"
-+        },
-+        {
-+          "name": "sha384"
-+        },
-+        {
-+          "name": "sha512"
-+        },
-+        {
-+          "name": "ripemd160"
-+        },
-+        {
-+          "name": "sm3"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "md5",
-+        "sha1",
-+        "sha224",
-+        "sha256",
-+        "sha384",
-+        "sha512",
-+        "ripemd160",
-+        "sm3"
-+      ]
-+    },
-+    {
-+      "name": "740",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "qcow",
-+          "type": "726"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "787"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "786"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "741",
-+      "members": [
-+        {
-+          "name": "v2"
-+        },
-+        {
-+          "name": "v3"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "v2",
-+        "v3"
-+      ]
-+    },
-+    {
-+      "name": "742",
-+      "members": [
-+        {
-+          "name": "zlib"
-+        },
-+        {
-+          "name": "zstd"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "zlib",
-+        "zstd"
-+      ]
-+    },
-+    {
-+      "name": "743",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "luks",
-+          "type": "788"
-+        },
-+        {
-+          "case": "luks2",
-+          "type": "789"
-+        },
-+        {
-+          "case": "luks-any",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "729"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "744",
-+      "members": [
-+        {
-+          "name": "dynamic"
-+        },
-+        {
-+          "name": "fixed"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "dynamic",
-+        "fixed"
-+      ]
-+    },
-+    {
-+      "name": "745",
-+      "members": [
-+        {
-+          "name": "monolithicSparse"
-+        },
-+        {
-+          "name": "monolithicFlat"
-+        },
-+        {
-+          "name": "twoGbMaxExtentSparse"
-+        },
-+        {
-+          "name": "twoGbMaxExtentFlat"
-+        },
-+        {
-+          "name": "streamOptimized"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "monolithicSparse",
-+        "monolithicFlat",
-+        "twoGbMaxExtentSparse",
-+        "twoGbMaxExtentFlat",
-+        "streamOptimized"
-+      ]
-+    },
-+    {
-+      "name": "746",
-+      "members": [
-+        {
-+          "name": "ide"
-+        },
-+        {
-+          "name": "buslogic"
-+        },
-+        {
-+          "name": "lsilogic"
-+        },
-+        {
-+          "name": "legacyESX"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ide",
-+        "buslogic",
-+        "lsilogic",
-+        "legacyESX"
-+      ]
-+    },
-+    {
-+      "name": "747",
-+      "members": [
-+        {
-+          "name": "dynamic"
-+        },
-+        {
-+          "name": "fixed"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "dynamic",
-+        "fixed"
-+      ]
-+    },
-+    {
-+      "name": "748",
-+      "members": [
-+        {
-+          "name": "active"
-+        },
-+        {
-+          "name": "inactive"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "active",
-+        "inactive"
-+      ]
-+    },
-+    {
-+      "name": "749",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "luks",
-+          "type": "790"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "786"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "750",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "out",
-+          "type": "str"
-+        },
-+        {
-+          "name": "append",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "751",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "752",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "addr",
-+          "type": "361"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "wait",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "nodelay",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "telnet",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "tn3270",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "websocket",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reconnect",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "reconnect-ms",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "753",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "remote",
-+          "type": "361"
-+        },
-+        {
-+          "name": "local",
-+          "default": null,
-+          "type": "361"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "754",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "755",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "756",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "757",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "chardevs",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "758",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "signal",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "759",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "760",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fqdn",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "761",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "mouse",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "clipboard",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "762",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "763",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "width",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "height",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cols",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "rows",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "764",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "765",
-+      "members": [
-+        {
-+          "name": "path",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cancel-path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "766",
-+      "members": [
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "767",
-+      "members": [
-+        {
-+          "name": "unmapped"
-+        },
-+        {
-+          "name": "shift"
-+        },
-+        {
-+          "name": "shift_r"
-+        },
-+        {
-+          "name": "alt"
-+        },
-+        {
-+          "name": "alt_r"
-+        },
-+        {
-+          "name": "ctrl"
-+        },
-+        {
-+          "name": "ctrl_r"
-+        },
-+        {
-+          "name": "menu"
-+        },
-+        {
-+          "name": "esc"
-+        },
-+        {
-+          "name": "1"
-+        },
-+        {
-+          "name": "2"
-+        },
-+        {
-+          "name": "3"
-+        },
-+        {
-+          "name": "4"
-+        },
-+        {
-+          "name": "5"
-+        },
-+        {
-+          "name": "6"
-+        },
-+        {
-+          "name": "7"
-+        },
-+        {
-+          "name": "8"
-+        },
-+        {
-+          "name": "9"
-+        },
-+        {
-+          "name": "0"
-+        },
-+        {
-+          "name": "minus"
-+        },
-+        {
-+          "name": "equal"
-+        },
-+        {
-+          "name": "backspace"
-+        },
-+        {
-+          "name": "tab"
-+        },
-+        {
-+          "name": "q"
-+        },
-+        {
-+          "name": "w"
-+        },
-+        {
-+          "name": "e"
-+        },
-+        {
-+          "name": "r"
-+        },
-+        {
-+          "name": "t"
-+        },
-+        {
-+          "name": "y"
-+        },
-+        {
-+          "name": "u"
-+        },
-+        {
-+          "name": "i"
-+        },
-+        {
-+          "name": "o"
-+        },
-+        {
-+          "name": "p"
-+        },
-+        {
-+          "name": "bracket_left"
-+        },
-+        {
-+          "name": "bracket_right"
-+        },
-+        {
-+          "name": "ret"
-+        },
-+        {
-+          "name": "a"
-+        },
-+        {
-+          "name": "s"
-+        },
-+        {
-+          "name": "d"
-+        },
-+        {
-+          "name": "f"
-+        },
-+        {
-+          "name": "g"
-+        },
-+        {
-+          "name": "h"
-+        },
-+        {
-+          "name": "j"
-+        },
-+        {
-+          "name": "k"
-+        },
-+        {
-+          "name": "l"
-+        },
-+        {
-+          "name": "semicolon"
-+        },
-+        {
-+          "name": "apostrophe"
-+        },
-+        {
-+          "name": "grave_accent"
-+        },
-+        {
-+          "name": "backslash"
-+        },
-+        {
-+          "name": "z"
-+        },
-+        {
-+          "name": "x"
-+        },
-+        {
-+          "name": "c"
-+        },
-+        {
-+          "name": "v"
-+        },
-+        {
-+          "name": "b"
-+        },
-+        {
-+          "name": "n"
-+        },
-+        {
-+          "name": "m"
-+        },
-+        {
-+          "name": "comma"
-+        },
-+        {
-+          "name": "dot"
-+        },
-+        {
-+          "name": "slash"
-+        },
-+        {
-+          "name": "asterisk"
-+        },
-+        {
-+          "name": "spc"
-+        },
-+        {
-+          "name": "caps_lock"
-+        },
-+        {
-+          "name": "f1"
-+        },
-+        {
-+          "name": "f2"
-+        },
-+        {
-+          "name": "f3"
-+        },
-+        {
-+          "name": "f4"
-+        },
-+        {
-+          "name": "f5"
-+        },
-+        {
-+          "name": "f6"
-+        },
-+        {
-+          "name": "f7"
-+        },
-+        {
-+          "name": "f8"
-+        },
-+        {
-+          "name": "f9"
-+        },
-+        {
-+          "name": "f10"
-+        },
-+        {
-+          "name": "num_lock"
-+        },
-+        {
-+          "name": "scroll_lock"
-+        },
-+        {
-+          "name": "kp_divide"
-+        },
-+        {
-+          "name": "kp_multiply"
-+        },
-+        {
-+          "name": "kp_subtract"
-+        },
-+        {
-+          "name": "kp_add"
-+        },
-+        {
-+          "name": "kp_enter"
-+        },
-+        {
-+          "name": "kp_decimal"
-+        },
-+        {
-+          "name": "sysrq"
-+        },
-+        {
-+          "name": "kp_0"
-+        },
-+        {
-+          "name": "kp_1"
-+        },
-+        {
-+          "name": "kp_2"
-+        },
-+        {
-+          "name": "kp_3"
-+        },
-+        {
-+          "name": "kp_4"
-+        },
-+        {
-+          "name": "kp_5"
-+        },
-+        {
-+          "name": "kp_6"
-+        },
-+        {
-+          "name": "kp_7"
-+        },
-+        {
-+          "name": "kp_8"
-+        },
-+        {
-+          "name": "kp_9"
-+        },
-+        {
-+          "name": "less"
-+        },
-+        {
-+          "name": "f11"
-+        },
-+        {
-+          "name": "f12"
-+        },
-+        {
-+          "name": "print"
-+        },
-+        {
-+          "name": "home"
-+        },
-+        {
-+          "name": "pgup"
-+        },
-+        {
-+          "name": "pgdn"
-+        },
-+        {
-+          "name": "end"
-+        },
-+        {
-+          "name": "left"
-+        },
-+        {
-+          "name": "up"
-+        },
-+        {
-+          "name": "down"
-+        },
-+        {
-+          "name": "right"
-+        },
-+        {
-+          "name": "insert"
-+        },
-+        {
-+          "name": "delete"
-+        },
-+        {
-+          "name": "stop"
-+        },
-+        {
-+          "name": "again"
-+        },
-+        {
-+          "name": "props"
-+        },
-+        {
-+          "name": "undo"
-+        },
-+        {
-+          "name": "front"
-+        },
-+        {
-+          "name": "copy"
-+        },
-+        {
-+          "name": "open"
-+        },
-+        {
-+          "name": "paste"
-+        },
-+        {
-+          "name": "find"
-+        },
-+        {
-+          "name": "cut"
-+        },
-+        {
-+          "name": "lf"
-+        },
-+        {
-+          "name": "help"
-+        },
-+        {
-+          "name": "meta_l"
-+        },
-+        {
-+          "name": "meta_r"
-+        },
-+        {
-+          "name": "compose"
-+        },
-+        {
-+          "name": "pause"
-+        },
-+        {
-+          "name": "ro"
-+        },
-+        {
-+          "name": "hiragana"
-+        },
-+        {
-+          "name": "henkan"
-+        },
-+        {
-+          "name": "yen"
-+        },
-+        {
-+          "name": "muhenkan"
-+        },
-+        {
-+          "name": "katakanahiragana"
-+        },
-+        {
-+          "name": "kp_comma"
-+        },
-+        {
-+          "name": "kp_equals"
-+        },
-+        {
-+          "name": "power"
-+        },
-+        {
-+          "name": "sleep"
-+        },
-+        {
-+          "name": "wake"
-+        },
-+        {
-+          "name": "audionext"
-+        },
-+        {
-+          "name": "audioprev"
-+        },
-+        {
-+          "name": "audiostop"
-+        },
-+        {
-+          "name": "audioplay"
-+        },
-+        {
-+          "name": "audiomute"
-+        },
-+        {
-+          "name": "volumeup"
-+        },
-+        {
-+          "name": "volumedown"
-+        },
-+        {
-+          "name": "mediaselect"
-+        },
-+        {
-+          "name": "mail"
-+        },
-+        {
-+          "name": "calculator"
-+        },
-+        {
-+          "name": "computer"
-+        },
-+        {
-+          "name": "ac_home"
-+        },
-+        {
-+          "name": "ac_back"
-+        },
-+        {
-+          "name": "ac_forward"
-+        },
-+        {
-+          "name": "ac_refresh"
-+        },
-+        {
-+          "name": "ac_bookmarks"
-+        },
-+        {
-+          "name": "lang1"
-+        },
-+        {
-+          "name": "lang2"
-+        },
-+        {
-+          "name": "f13"
-+        },
-+        {
-+          "name": "f14"
-+        },
-+        {
-+          "name": "f15"
-+        },
-+        {
-+          "name": "f16"
-+        },
-+        {
-+          "name": "f17"
-+        },
-+        {
-+          "name": "f18"
-+        },
-+        {
-+          "name": "f19"
-+        },
-+        {
-+          "name": "f20"
-+        },
-+        {
-+          "name": "f21"
-+        },
-+        {
-+          "name": "f22"
-+        },
-+        {
-+          "name": "f23"
-+        },
-+        {
-+          "name": "f24"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "unmapped",
-+        "shift",
-+        "shift_r",
-+        "alt",
-+        "alt_r",
-+        "ctrl",
-+        "ctrl_r",
-+        "menu",
-+        "esc",
-+        "1",
-+        "2",
-+        "3",
-+        "4",
-+        "5",
-+        "6",
-+        "7",
-+        "8",
-+        "9",
-+        "0",
-+        "minus",
-+        "equal",
-+        "backspace",
-+        "tab",
-+        "q",
-+        "w",
-+        "e",
-+        "r",
-+        "t",
-+        "y",
-+        "u",
-+        "i",
-+        "o",
-+        "p",
-+        "bracket_left",
-+        "bracket_right",
-+        "ret",
-+        "a",
-+        "s",
-+        "d",
-+        "f",
-+        "g",
-+        "h",
-+        "j",
-+        "k",
-+        "l",
-+        "semicolon",
-+        "apostrophe",
-+        "grave_accent",
-+        "backslash",
-+        "z",
-+        "x",
-+        "c",
-+        "v",
-+        "b",
-+        "n",
-+        "m",
-+        "comma",
-+        "dot",
-+        "slash",
-+        "asterisk",
-+        "spc",
-+        "caps_lock",
-+        "f1",
-+        "f2",
-+        "f3",
-+        "f4",
-+        "f5",
-+        "f6",
-+        "f7",
-+        "f8",
-+        "f9",
-+        "f10",
-+        "num_lock",
-+        "scroll_lock",
-+        "kp_divide",
-+        "kp_multiply",
-+        "kp_subtract",
-+        "kp_add",
-+        "kp_enter",
-+        "kp_decimal",
-+        "sysrq",
-+        "kp_0",
-+        "kp_1",
-+        "kp_2",
-+        "kp_3",
-+        "kp_4",
-+        "kp_5",
-+        "kp_6",
-+        "kp_7",
-+        "kp_8",
-+        "kp_9",
-+        "less",
-+        "f11",
-+        "f12",
-+        "print",
-+        "home",
-+        "pgup",
-+        "pgdn",
-+        "end",
-+        "left",
-+        "up",
-+        "down",
-+        "right",
-+        "insert",
-+        "delete",
-+        "stop",
-+        "again",
-+        "props",
-+        "undo",
-+        "front",
-+        "copy",
-+        "open",
-+        "paste",
-+        "find",
-+        "cut",
-+        "lf",
-+        "help",
-+        "meta_l",
-+        "meta_r",
-+        "compose",
-+        "pause",
-+        "ro",
-+        "hiragana",
-+        "henkan",
-+        "yen",
-+        "muhenkan",
-+        "katakanahiragana",
-+        "kp_comma",
-+        "kp_equals",
-+        "power",
-+        "sleep",
-+        "wake",
-+        "audionext",
-+        "audioprev",
-+        "audiostop",
-+        "audioplay",
-+        "audiomute",
-+        "volumeup",
-+        "volumedown",
-+        "mediaselect",
-+        "mail",
-+        "calculator",
-+        "computer",
-+        "ac_home",
-+        "ac_back",
-+        "ac_forward",
-+        "ac_refresh",
-+        "ac_bookmarks",
-+        "lang1",
-+        "lang2",
-+        "f13",
-+        "f14",
-+        "f15",
-+        "f16",
-+        "f17",
-+        "f18",
-+        "f19",
-+        "f20",
-+        "f21",
-+        "f22",
-+        "f23",
-+        "f24"
-+      ]
-+    },
-+    {
-+      "name": "768",
-+      "members": [
-+        {
-+          "name": "key",
-+          "type": "415"
-+        },
-+        {
-+          "name": "down",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "769",
-+      "members": [
-+        {
-+          "name": "button",
-+          "type": "791"
-+        },
-+        {
-+          "name": "down",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "770",
-+      "members": [
-+        {
-+          "name": "axis",
-+          "type": "792"
-+        },
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "771",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "793"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "int"
-+        },
-+        {
-+          "name": "tracking-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "axis",
-+          "type": "792"
-+        },
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "772",
-+      "members": [
-+        {
-+          "name": "persistent",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "773",
-+      "members": [
-+        {
-+          "name": "socket"
-+        },
-+        {
-+          "name": "exec"
-+        },
-+        {
-+          "name": "rdma"
-+        },
-+        {
-+          "name": "file"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "socket",
-+        "exec",
-+        "rdma",
-+        "file"
-+      ]
-+    },
-+    {
-+      "name": "774",
-+      "members": [
-+        {
-+          "name": "args",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "775",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "776",
-+      "members": [],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "777",
-+      "members": [
-+        {
-+          "name": "exact"
-+        },
-+        {
-+          "name": "glob"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "exact",
-+        "glob"
-+      ]
-+    },
-+    {
-+      "name": "778",
-+      "members": [
-+        {
-+          "name": "u8"
-+        },
-+        {
-+          "name": "s8"
-+        },
-+        {
-+          "name": "u16"
-+        },
-+        {
-+          "name": "s16"
-+        },
-+        {
-+          "name": "u32"
-+        },
-+        {
-+          "name": "s32"
-+        },
-+        {
-+          "name": "f32"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "u8",
-+        "s8",
-+        "u16",
-+        "s16",
-+        "u32",
-+        "s32",
-+        "f32"
-+      ]
-+    },
-+    {
-+      "name": "779",
-+      "members": [
-+        {
-+          "name": "number",
-+          "type": "int"
-+        },
-+        {
-+          "name": "secondary",
-+          "type": "int"
-+        },
-+        {
-+          "name": "subordinate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "io_range",
-+          "type": "794"
-+        },
-+        {
-+          "name": "memory_range",
-+          "type": "794"
-+        },
-+        {
-+          "name": "prefetchable_range",
-+          "type": "794"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "780",
-+      "members": [
-+        {
-+          "name": "compat",
-+          "type": "str"
-+        },
-+        {
-+          "name": "data-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "data-file-raw",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "extended-l2",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "lazy-refcounts",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "corrupt",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "refcount-bits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "795"
-+        },
-+        {
-+          "name": "bitmaps",
-+          "default": null,
-+          "type": "[796]"
-+        },
-+        {
-+          "name": "compression-type",
-+          "type": "742"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "781",
-+      "members": [
-+        {
-+          "name": "create-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cid",
-+          "type": "int"
-+        },
-+        {
-+          "name": "parent-cid",
-+          "type": "int"
-+        },
-+        {
-+          "name": "extents",
-+          "type": "[797]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "782",
-+      "members": [
-+        {
-+          "name": "cipher-alg",
-+          "type": "736"
-+        },
-+        {
-+          "name": "cipher-mode",
-+          "type": "737"
-+        },
-+        {
-+          "name": "ivgen-alg",
-+          "type": "738"
-+        },
-+        {
-+          "name": "ivgen-hash-alg",
-+          "default": null,
-+          "type": "739"
-+        },
-+        {
-+          "name": "hash-alg",
-+          "type": "739"
-+        },
-+        {
-+          "name": "detached-header",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "payload-offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "master-key-iters",
-+          "type": "int"
-+        },
-+        {
-+          "name": "uuid",
-+          "type": "str"
-+        },
-+        {
-+          "name": "slots",
-+          "type": "[798]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "783",
-+      "members": [
-+        {
-+          "name": "encryption-format",
-+          "default": null,
-+          "type": "729"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "784",
-+      "members": [
-+        {
-+          "name": "extent-size-hint",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "785",
-+      "members": [
-+        {
-+          "name": "md5"
-+        },
-+        {
-+          "name": "sha1"
-+        },
-+        {
-+          "name": "sha256"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "md5",
-+        "sha1",
-+        "sha256"
-+      ]
-+    },
-+    {
-+      "name": "786",
-+      "members": [
-+        {
-+          "name": "qcow"
-+        },
-+        {
-+          "name": "luks"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "qcow",
-+        "luks"
-+      ]
-+    },
-+    {
-+      "name": "787",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cipher-alg",
-+          "default": null,
-+          "type": "736"
-+        },
-+        {
-+          "name": "cipher-mode",
-+          "default": null,
-+          "type": "737"
-+        },
-+        {
-+          "name": "ivgen-alg",
-+          "default": null,
-+          "type": "738"
-+        },
-+        {
-+          "name": "ivgen-hash-alg",
-+          "default": null,
-+          "type": "739"
-+        },
-+        {
-+          "name": "hash-alg",
-+          "default": null,
-+          "type": "739"
-+        },
-+        {
-+          "name": "iter-time",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "788",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cipher-alg",
-+          "default": null,
-+          "type": "736"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "789",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cipher-alg",
-+          "default": null,
-+          "type": "736"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "790",
-+      "members": [
-+        {
-+          "name": "state",
-+          "type": "748"
-+        },
-+        {
-+          "name": "new-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "old-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "keyslot",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iter-time",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "791",
-+      "members": [
-+        {
-+          "name": "left"
-+        },
-+        {
-+          "name": "middle"
-+        },
-+        {
-+          "name": "right"
-+        },
-+        {
-+          "name": "wheel-up"
-+        },
-+        {
-+          "name": "wheel-down"
-+        },
-+        {
-+          "name": "side"
-+        },
-+        {
-+          "name": "extra"
-+        },
-+        {
-+          "name": "wheel-left"
-+        },
-+        {
-+          "name": "wheel-right"
-+        },
-+        {
-+          "name": "touch"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "left",
-+        "middle",
-+        "right",
-+        "wheel-up",
-+        "wheel-down",
-+        "side",
-+        "extra",
-+        "wheel-left",
-+        "wheel-right",
-+        "touch"
-+      ]
-+    },
-+    {
-+      "name": "792",
-+      "members": [
-+        {
-+          "name": "x"
-+        },
-+        {
-+          "name": "y"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "x",
-+        "y"
-+      ]
-+    },
-+    {
-+      "name": "793",
-+      "members": [
-+        {
-+          "name": "begin"
-+        },
-+        {
-+          "name": "update"
-+        },
-+        {
-+          "name": "end"
-+        },
-+        {
-+          "name": "cancel"
-+        },
-+        {
-+          "name": "data"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "begin",
-+        "update",
-+        "end",
-+        "cancel",
-+        "data"
-+      ]
-+    },
-+    {
-+      "name": "794",
-+      "members": [
-+        {
-+          "name": "base",
-+          "type": "int"
-+        },
-+        {
-+          "name": "limit",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "795",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "luks",
-+          "type": "782"
-+        },
-+        {
-+          "case": "aes",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "725"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[796]",
-+      "element-type": "796",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "796",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "granularity",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flags",
-+          "type": "[799]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[797]",
-+      "element-type": "797",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "797",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "type": "str"
-+        },
-+        {
-+          "name": "virtual-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "compressed",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[798]",
-+      "element-type": "798",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "798",
-+      "members": [
-+        {
-+          "name": "active",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "iters",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "stripes",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "key-offset",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[799]",
-+      "element-type": "799",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "799",
-+      "members": [
-+        {
-+          "name": "in-use"
-+        },
-+        {
-+          "name": "auto"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "in-use",
-+        "auto"
-+      ]
-+    }
-+  ],
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "execute": "query-kvm",
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "return": {
-+    "enabled": true,
-+    "present": true
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "execute": "qom-list-types",
-+  "id": "libvirt-6"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "EPYC-Genoa-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-vsock-device",
-+      "parent": "vhost-vsock-common"
-+    },
-+    {
-+      "name": "pcie-pci-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "pc-q35-2.11-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "acpi-erst",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ClearwaterForest-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-i440fx-7.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "Haswell-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "isa-applesmc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "Westmere-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-redir",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "virtio-rng-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "floppy-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "Denverton-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "chardev-testdev",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "usb-wacom-tablet",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "sev-guest",
-+      "parent": "sev-common"
-+    },
-+    {
-+      "name": "pci-ipmi-bt",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "filter-buffer",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "ufs-lu",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "ich9-usb-uhci6",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "secondary-vga",
-+      "parent": "pci-vga"
-+    },
-+    {
-+      "name": "kvm-pit",
-+      "parent": "pit-common"
-+    },
-+    {
-+      "name": "tpm-crb",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "rtl8139",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "core2duo-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pci-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "pc-q35-2.5-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-i440fx-3.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "cxl-rp",
-+      "parent": "pcie-root-port-base"
-+    },
-+    {
-+      "name": "virtio-crypto-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "ich9-usb-uhci5",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "pcm3680_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vhost-user-input-pci",
-+      "parent": "vhost-user-input-pci-base-type"
-+    },
-+    {
-+      "name": "vmware-svga",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-mmio-bus",
-+      "parent": "virtio-bus"
-+    },
-+    {
-+      "name": "i8042-mmio",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "kvm-ioapic",
-+      "parent": "ioapic-common"
-+    },
-+    {
-+      "name": "gus",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "serial",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "ich9-usb-uhci4",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "pxb-cxl-host",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "usb-hub",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "pc-i440fx-9.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-9p-pci-transitional",
-+      "parent": "virtio-9p-pci-base"
-+    },
-+    {
-+      "name": "chardev-pty",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-blk-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "ich9-usb-uhci3",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "Opteron_G5-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-gpu-gl-device",
-+      "parent": "virtio-gpu-device"
-+    },
-+    {
-+      "name": "pc-q35-6.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "Westmere-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "qtest-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "chardev-wctablet",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "xen-primary-console",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "PCIE",
-+      "parent": "PCI"
-+    },
-+    {
-+      "name": "ich9-usb-uhci2",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "pc-i440fx-2.8-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "chardev-serial",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "resettable-container",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "vhost-user-vsock-pci",
-+      "parent": "vhost-user-vsock-pci-base"
-+    },
-+    {
-+      "name": "Cooperlake-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ich9-usb-uhci1",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "qemu-text-console",
-+      "parent": "qemu-console"
-+    },
-+    {
-+      "name": "pc-i440fx-5.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "scsi-generic",
-+      "parent": "scsi-device"
-+    },
-+    {
-+      "name": "ICH9-SMB",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "kvmclock",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pc-i440fx-8.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-user-snd-pci",
-+      "parent": "vhost-user-snd-pci-base"
-+    },
-+    {
-+      "name": "x3130-upstream",
-+      "parent": "pcie-port"
-+    },
-+    {
-+      "name": "virtio-serial-pci-transitional",
-+      "parent": "virtio-serial-pci-base"
-+    },
-+    {
-+      "name": "memory-backend-ram",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "e1000e",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-gpu-pci",
-+      "parent": "virtio-gpu-pci-base-type"
-+    },
-+    {
-+      "name": "n270-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pxb-host",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "virtio-serial-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "chardev-file",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "Icelake-Server-v3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "tpm-passthrough",
-+      "parent": "tpm-backend"
-+    },
-+    {
-+      "name": "usb-host",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "pentium3-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ufs-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "ps2-mouse",
-+      "parent": "ps2-device"
-+    },
-+    {
-+      "name": "tulip",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "xen-xenstore",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "piix3-ide",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "filter-rewriter",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "pc-i440fx-4.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-scsi-pci",
-+      "parent": "vhost-scsi-pci-base"
-+    },
-+    {
-+      "name": "acpi-ged",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "isa-ipmi-bt",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-q35-8.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-user-vsock-pci-non-transitional",
-+      "parent": "vhost-user-vsock-pci-base"
-+    },
-+    {
-+      "name": "ICH9-LPC",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pci-ipmi-kcs",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "xio3130-downstream",
-+      "parent": "pcie-slot"
-+    },
-+    {
-+      "name": "intel-iommu-iommu-memory-region",
-+      "parent": "iommu-memory-region"
-+    },
-+    {
-+      "name": "ufs",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Snowridge-v3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "PCI",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "microvm-machine",
-+      "parent": "x86-machine"
-+    },
-+    {
-+      "name": "sdhci-bus",
-+      "parent": "sd-bus"
-+    },
-+    {
-+      "name": "imx-usdhc",
-+      "parent": "generic-sdhci"
-+    },
-+    {
-+      "name": "pci-serial-2x",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-i440fx-6.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-9p-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "vhost-user-i2c-device",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "virtio-scsi-pci",
-+      "parent": "virtio-scsi-pci-base"
-+    },
-+    {
-+      "name": "ipmi-bmc-extern",
-+      "parent": "ipmi-bmc"
-+    },
-+    {
-+      "name": "EPYC-Rome-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-4.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "authz-list-file",
-+      "parent": "authz"
-+    },
-+    {
-+      "name": "usb-audio",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "SierraForest-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-7.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "qemu32-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Skylake-Client-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-vsock-pci-non-transitional",
-+      "parent": "vhost-vsock-pci-base"
-+    },
-+    {
-+      "name": "ich9-usb-ehci2",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "usb-net",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "CXL",
-+      "parent": "PCIE"
-+    },
-+    {
-+      "name": "xen-gnttab",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "isa-debug-exit",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "vfio-pci-nohotplug",
-+      "parent": "vfio-pci"
-+    },
-+    {
-+      "name": "KnightsMill-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "memory-region",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "chardev-udp",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "i2c-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "acpi-generic-port",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "Skylake-Server-v3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ctucan_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ich9-usb-ehci1",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "pc-q35-3.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-input-host-pci",
-+      "parent": "virtio-input-host-pci-base-type"
-+    },
-+    {
-+      "name": "nvdimm",
-+      "parent": "pc-dimm"
-+    },
-+    {
-+      "name": "mch",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Icelake-Server-v5-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "chardev-memory",
-+      "parent": "chardev-ringbuf"
-+    },
-+    {
-+      "name": "Opteron_G1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-mem",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "vhost-user-device-pci",
-+      "parent": "vhost-user-device-pci-base"
-+    },
-+    {
-+      "name": "pr-manager-helper",
-+      "parent": "pr-manager"
-+    },
-+    {
-+      "name": "pc-i440fx-2.10-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "thread-context",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "i82557c",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82557b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "EPYC-Milan-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-scsi-device",
-+      "parent": "virtio-scsi-common"
-+    },
-+    {
-+      "name": "pc-q35-9.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pxb-pcie",
-+      "parent": "pxb"
-+    },
-+    {
-+      "name": "Haswell-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-i2c-pci",
-+      "parent": "vhost-user-i2c-pci-base"
-+    },
-+    {
-+      "name": "input-barrier",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "xen-backend",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "sysbus-xhci",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pc-i440fx-10.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "Haswell-v3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-scsi-pci-non-transitional",
-+      "parent": "vhost-user-scsi-pci-base"
-+    },
-+    {
-+      "name": "i82557a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-q35-2.8-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "generic-sdhci",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "virtio-scsi-pci-non-transitional",
-+      "parent": "virtio-scsi-pci-base"
-+    },
-+    {
-+      "name": "vmmouse",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "migration",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "athlon-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ps2-kbd",
-+      "parent": "ps2-device"
-+    },
-+    {
-+      "name": "EPYC-Rome-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-mouse-pci",
-+      "parent": "virtio-mouse-pci-base-type"
-+    },
-+    {
-+      "name": "cxl-switch-mailbox-cci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-q35-5.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "Skylake-Server-v5-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "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"
-+    },
-+    {
-+      "name": "vhost-vsock-device",
-+      "parent": "vhost-vsock-common"
-+    },
-+    {
-+      "name": "Opteron_G2-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "chardev-dbus",
-+      "parent": "chardev-socket"
-+    },
-+    {
-+      "name": "Broadwell-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-i440fx-7.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "sd-card-spi",
-+      "parent": "sd-card"
-+    },
-+    {
-+      "name": "usb-braille",
-+      "parent": "usb-serial-dev"
-+    },
-+    {
-+      "name": "EPYC-IBPB-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Nehalem-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ib700",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "amd-iommu",
-+      "parent": "x86-iommu"
-+    },
-+    {
-+      "name": "virtio-9p-pci-non-transitional",
-+      "parent": "virtio-9p-pci-base"
-+    },
-+    {
-+      "name": "isa-pcspk",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "memory-backend-file",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "xen-disk",
-+      "parent": "xen-block"
-+    },
-+    {
-+      "name": "xen-console",
-+      "parent": "xen-device"
-+    },
-+    {
-+      "name": "ide-cf",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "sd-card",
-+      "parent": "sdmmc-common"
-+    },
-+    {
-+      "name": "pc-q35-4.0.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-scsi",
-+      "parent": "vhost-scsi-common"
-+    },
-+    {
-+      "name": "usb-tablet",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "IvyBridge-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "qio-channel-null",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "Icelake-Server-noTSX-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-blk-pci-non-transitional",
-+      "parent": "virtio-blk-pci-base"
-+    },
-+    {
-+      "name": "esp",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "isabus-bridge",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "ne2k_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "usb-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "ide-cd",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "qtest",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "EPYC-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "tcg-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "virtio-gpu-device",
-+      "parent": "virtio-gpu-base"
-+    },
-+    {
-+      "name": "virtio-balloon-pci",
-+      "parent": "virtio-balloon-pci-base"
-+    },
-+    {
-+      "name": "athlon-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Cascadelake-Server-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "e1000",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "piix4-ide",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "pc-i440fx-9.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "nvme",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Conroe-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82551",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "SandyBridge-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "isa-ipmi-kcs",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "i82550",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "EPYC-Rome-v3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "cxl-type3",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i2c-echo",
-+      "parent": "i2c-slave"
-+    },
-+    {
-+      "name": "pc-i440fx-2.6-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-q35-6.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-user-backend",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "mioe3680_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vmxnet3",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ES1370",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "nec-usb-xhci",
-+      "parent": "pci-xhci"
-+    },
-+    {
-+      "name": "kvm64-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "kvm-apic",
-+      "parent": "apic-common"
-+    },
-+    {
-+      "name": "virtio-sound-pci",
-+      "parent": "virtio-sound-pci-base-type"
-+    },
-+    {
-+      "name": "isa-pit",
-+      "parent": "pit-common"
-+    },
-+    {
-+      "name": "Broadwell-v4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-i440fx-8.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "memory-backend-memfd",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "smbus-eeprom",
-+      "parent": "smbus-device"
-+    },
-+    {
-+      "name": "dbus-display",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-serial-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "vhost-user-gpu-pci",
-+      "parent": "vhost-user-gpu-pci-base-type"
-+    },
-+    {
-+      "name": "virtio-serial-pci",
-+      "parent": "virtio-serial-pci-base"
-+    },
-+    {
-+      "name": "iothread",
-+      "parent": "event-loop-base"
-+    },
-+    {
-+      "name": "xen-bridge",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "Denverton-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "SierraForest-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-crypto-pci",
-+      "parent": "virtio-crypto-pci-base-type"
-+    },
-+    {
-+      "name": "i8042",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "imx.usbphy",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "virtio-mem-system-reset",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "System",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "xen-net-device",
-+      "parent": "xen-device"
-+    },
-+    {
-+      "name": "ati-vga",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pentium3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "kvm-i8259",
-+      "parent": "pic-common"
-+    },
-+    {
-+      "name": "isa-serial",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-q35-8.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "x-remote-object",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "core2duo-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-blk-pci-non-transitional",
-+      "parent": "vhost-user-blk-pci-base"
-+    },
-+    {
-+      "name": "cirrus-vga",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "main-loop",
-+      "parent": "event-loop-base"
-+    },
-+    {
-+      "name": "kvm32-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Cascadelake-Server-v4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-rng-pci-non-transitional",
-+      "parent": "virtio-rng-pci-base"
-+    },
-+    {
-+      "name": "i82559er",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "remote-pcihost",
-+      "parent": "pcie-host-bridge"
-+    },
-+    {
-+      "name": "Icelake-Server-v7-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Skylake-Client-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Opteron_G3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "xen-cdrom",
-+      "parent": "xen-block"
-+    },
-+    {
-+      "name": "Cooperlake-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "container",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "isa-ide",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "486-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "EPYC-v3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "scsi-cd",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "pc-q35-7.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "gpex-root",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vmport",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "sgx-epc",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "am53c974",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-serial-pci-non-transitional",
-+      "parent": "virtio-serial-pci-base"
-+    },
-+    {
-+      "name": "qemu64-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "e1000-82545em",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "pxb-pcie-bus",
-+      "parent": "PCIE"
-+    },
-+    {
-+      "name": "vhost-user-scsi",
-+      "parent": "vhost-scsi-common"
-+    },
-+    {
-+      "name": "sdhci-pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "igbvf",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "PIIX4_PM",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-rng-pci-transitional",
-+      "parent": "virtio-rng-pci-base"
-+    },
-+    {
-+      "name": "EPYC-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-vdpa-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "usb-bot",
-+      "parent": "usb-storage-dev"
-+    },
-+    {
-+      "name": "virtio-gpu-gl-pci",
-+      "parent": "virtio-gpu-gl-pci-base-type"
-+    },
-+    {
-+      "name": "pc-q35-2.12-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "VGA",
-+      "parent": "pci-vga"
-+    },
-+    {
-+      "name": "qio-channel-buffer",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "i440FX",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "hv-balloon",
-+      "parent": "vmbus-dev"
-+    },
-+    {
-+      "name": "xen-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "Penryn-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-9.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "Conroe-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "cryptodev-backend-lkcf",
-+      "parent": "cryptodev-backend"
-+    },
-+    {
-+      "name": "apic",
-+      "parent": "apic-common"
-+    },
-+    {
-+      "name": "vhost-user-fs-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "Icelake-Server-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pci-serial-4x",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-i440fx-3.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "xen-evtchn",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "Opteron_G5-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-2.6-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "hpet",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pci-ohci",
-+      "parent": "pci-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"
-+    },
-+    {
-+      "name": "ccid-card-passthru",
-+      "parent": "ccid-card"
-+    },
-+    {
-+      "name": "chardev-parallel",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "chardev-vc",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "cryptodev-backend",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "tls-creds-x509",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "isapc-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "cryptodev-vhost-user",
-+      "parent": "cryptodev-backend"
-+    },
-+    {
-+      "name": "tpm-emulator",
-+      "parent": "tpm-backend"
-+    },
-+    {
-+      "name": "i8257",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "usb-uas",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "IvyBridge-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "SandyBridge-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-i440fx-2.9-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "ivshmem-plain",
-+      "parent": "ivshmem-common"
-+    },
-+    {
-+      "name": "virtio-keyboard-pci",
-+      "parent": "virtio-keyboard-pci-base-type"
-+    },
-+    {
-+      "name": "pcnet",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Dhyana-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-i440fx-5.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "qemu-graphic-console",
-+      "parent": "qemu-console"
-+    },
-+    {
-+      "name": "i82559c",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "AMDVI-PCI",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-spiceport",
-+      "parent": "chardev-spice"
-+    },
-+    {
-+      "name": "virtserialport",
-+      "parent": "virtio-serial-port"
-+    },
-+    {
-+      "name": "ipoctal232",
-+      "parent": "ipack-device"
-+    },
-+    {
-+      "name": "i82559b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Nehalem-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-mouse",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "filter-redirector",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "ccid-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "ide-hd",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "qio-channel-command",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "Snowridge-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Broadwell-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-scsi-pci",
-+      "parent": "vhost-user-scsi-pci-base"
-+    },
-+    {
-+      "name": "emmc",
-+      "parent": "sdmmc-common"
-+    },
-+    {
-+      "name": "i82559a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "kvaser_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "dbus-vmstate",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "acpi-generic-initiator",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "pc-i440fx-4.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-blk-pci",
-+      "parent": "virtio-blk-pci-base"
-+    },
-+    {
-+      "name": "e1000-82544gc",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "host-iommu-device-iommufd-vfio",
-+      "parent": "host-iommu-device-iommufd"
-+    },
-+    {
-+      "name": "Opteron_G3-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-ccid",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "x-remote-iommu",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "qemu-fixed-text-console",
-+      "parent": "qemu-text-console"
-+    },
-+    {
-+      "name": "port92",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-i440fx-2.4-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "isa-cirrus-vga",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "qemu64-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Skylake-Server-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "chardev-braille",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "vfio-pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-q35-4.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "mc146818rtc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "virtio-multitouch-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "bochs-display",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Broadwell-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "GraniteRapids-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "qio-net-listener",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "edu",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-testdev",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "qio-channel-websock",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "vfio-iommu-iommufd",
-+      "parent": "vfio-iommu"
-+    },
-+    {
-+      "name": "megasas",
-+      "parent": "megasas-base"
-+    },
-+    {
-+      "name": "virtio-pmem",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "virtio-iommu-pci",
-+      "parent": "virtio-iommu-pci-base-type"
-+    },
-+    {
-+      "name": "pc-i440fx-6.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-vdpa-device-pci-non-transitional",
-+      "parent": "vhost-vdpa-device-pci-base"
-+    },
-+    {
-+      "name": "vmcoreinfo",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "tpci200",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "rocker",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "qio-channel-file",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "gpio_i2c",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "secret",
-+      "parent": "secret_common"
-+    },
-+    {
-+      "name": "qio-channel-socket",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "coreduo-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-3.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "Icelake-Server-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "chardev-socket",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "clock",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "ioh3420",
-+      "parent": "pcie-root-port-base"
-+    },
-+    {
-+      "name": "Haswell-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "host-x86_64-cpu",
-+      "parent": "max-x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-multitouch-pci",
-+      "parent": "virtio-multitouch-pci-base-type"
-+    },
-+    {
-+      "name": "usb-ehci",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "pc-i440fx-2.11-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pxb",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "AC97",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vmgenid",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "Cascadelake-Server-noTSX-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-net-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "nvme-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "xen-sysbus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "virtio-net-pci-non-transitional",
-+      "parent": "virtio-net-pci-base"
-+    },
-+    {
-+      "name": "cs4231a",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "hyperv-testdev",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "scsi-hd",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "usb-kbd",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "isa-fdc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "base-xhci",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "Skylake-Client-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "filter-replay",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "usb-mtp",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "input-linux",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "ccid-card-emulated",
-+      "parent": "ccid-card"
-+    },
-+    {
-+      "name": "pc-q35-2.9-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "filter-mirror",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-rng",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "s3c-sdhci",
-+      "parent": "generic-sdhci"
-+    },
-+    {
-+      "name": "tpm-tis",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "fw_cfg_mem",
-+      "parent": "fw_cfg"
-+    },
-+    {
-+      "name": "Westmere-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-5.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "lsi53c810",
-+      "parent": "lsi53c895a"
-+    },
-+    {
-+      "name": "x-pci-proxy-dev",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-mouse-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "virtconsole",
-+      "parent": "virtserialport"
-+    },
-+    {
-+      "name": "guest-loader",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "x-remote-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "throttle-group",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-rng-pci",
-+      "parent": "virtio-rng-pci-base"
-+    },
-+    {
-+      "name": "piix4-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "pc-q35-2.10-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-vdpa-device-pci-transitional",
-+      "parent": "vhost-vdpa-device-pci-base"
-+    },
-+    {
-+      "name": "pc-i440fx-7.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "chardev-gdb",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "vhost-user-gpio-device",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "virtio-scsi-pci-transitional",
-+      "parent": "virtio-scsi-pci-base"
-+    },
-+    {
-+      "name": "vfio-iommu-legacy",
-+      "parent": "vfio-iommu"
-+    },
-+    {
-+      "name": "gpex-pcihost",
-+      "parent": "pcie-host-bridge"
-+    },
-+    {
-+      "name": "iommufd",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "Cascadelake-Server-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-device",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "pc-q35-10.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "Icelake-Server-v4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pci-testdev",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vhost-user-input",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "xen-overlay",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "ich9-intel-hda",
-+      "parent": "intel-hda-generic"
-+    },
-+    {
-+      "name": "secret_keyring",
-+      "parent": "secret_common"
-+    },
-+    {
-+      "name": "PIIX3",
-+      "parent": "pci-piix"
-+    },
-+    {
-+      "name": "pc-q35-2.4-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "tls-creds-psk",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "virtio-9p-pci",
-+      "parent": "virtio-9p-pci-base"
-+    },
-+    {
-+      "name": "ISA",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "phenom-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-net-pci-transitional",
-+      "parent": "virtio-net-pci-base"
-+    },
-+    {
-+      "name": "vhost-vsock-pci",
-+      "parent": "vhost-vsock-pci-base"
-+    },
-+    {
-+      "name": "virtio-sound-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "pc-dimm",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "pxb-cxl-bus",
-+      "parent": "CXL"
-+    },
-+    {
-+      "name": "pc-i440fx-9.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "irq",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-balloon-pci-non-transitional",
-+      "parent": "virtio-balloon-pci-base"
-+    },
-+    {
-+      "name": "ipmi-bmc-sim",
-+      "parent": "ipmi-bmc"
-+    },
-+    {
-+      "name": "Snowridge-v4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vmbus-bridge",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "IvyBridge-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-blk-pci-transitional",
-+      "parent": "vhost-user-blk-pci-base"
-+    },
-+    {
-+      "name": "coreduo-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Skylake-Client-noTSX-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pentium2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-scsi-pci-transitional",
-+      "parent": "vhost-scsi-pci-base"
-+    },
-+    {
-+      "name": "usb-storage",
-+      "parent": "usb-storage-dev"
-+    },
-+    {
-+      "name": "chardev-msmouse",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "pc-q35-6.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-i440fx-2.7-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "SapphireRapids-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "isa-i8259",
-+      "parent": "pic-common"
-+    },
-+    {
-+      "name": "Skylake-Client-v3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "colo-compare",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "sev-snp-guest",
-+      "parent": "sev-common"
-+    },
-+    {
-+      "name": "KnightsMill-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-mmio",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pxb-bus",
-+      "parent": "PCI"
-+    },
-+    {
-+      "name": "Broadwell-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "EPYC-Milan-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-i440fx-8.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "qemu-xhci",
-+      "parent": "pci-xhci"
-+    },
-+    {
-+      "name": "n270-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pvpanic",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "rng-random",
-+      "parent": "rng-backend"
-+    },
-+    {
-+      "name": "Skylake-Server-v4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Nehalem-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "kvmvapic",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "nvme-ns",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "Icelake-Server-v6-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Opteron_G2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "megasas-gen2",
-+      "parent": "megasas-base"
-+    },
-+    {
-+      "name": "vhost-user-blk-pci",
-+      "parent": "vhost-user-blk-pci-base"
-+    },
-+    {
-+      "name": "authz-simple",
-+      "parent": "authz"
-+    },
-+    {
-+      "name": "fw_cfg_io",
-+      "parent": "fw_cfg"
-+    },
-+    {
-+      "name": "intel-iommu",
-+      "parent": "x86-iommu"
-+    },
-+    {
-+      "name": "none-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "HDA",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "Broadwell-noTSX-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "u2f-passthru",
-+      "parent": "u2f-key"
-+    },
-+    {
-+      "name": "Snowridge-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-8.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "IvyBridge-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vfio-pci-igd-lpc-bridge",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "sysbus-esp",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "qxl",
-+      "parent": "pci-qxl"
-+    },
-+    {
-+      "name": "cryptodev-backend-builtin",
-+      "parent": "cryptodev-backend"
-+    },
-+    {
-+      "name": "tls-cipher-suites",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "host-iommu-device-legacy-vfio",
-+      "parent": "host-iommu-device"
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "qio-dns-resolver",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-balloon-pci-transitional",
-+      "parent": "virtio-balloon-pci-base"
-+    },
-+    {
-+      "name": "igb",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Haswell-v4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "SapphireRapids-v3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "hv-syndbg",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "EPYC-Rome-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82801b11-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "virtio-keyboard-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "ramfb",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "hda-output",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "pc-q35-7.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-input-host-device",
-+      "parent": "virtio-input-device"
-+    },
-+    {
-+      "name": "IndustryPack",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "Broadwell-v3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ioapic",
-+      "parent": "ioapic-common"
-+    },
-+    {
-+      "name": "pentium-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "qemu32-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "xen-sysdev",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "memory-region-portio-list",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "Haswell-noTSX-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pci-serial",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "kvm-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "vhost-scsi-pci-non-transitional",
-+      "parent": "vhost-scsi-pci-base"
-+    },
-+    {
-+      "name": "Denverton-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "piix3-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "Opteron_G4-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "qio-channel-rdma",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "ne2k_isa",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "virtio-iommu-memory-region",
-+      "parent": "iommu-memory-region"
-+    },
-+    {
-+      "name": "phenom-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "adlib",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "vhost-user-gpio-pci",
-+      "parent": "vhost-user-gpio-pci-base"
-+    },
-+    {
-+      "name": "vhost-user-gpu",
-+      "parent": "virtio-gpu-base"
-+    },
-+    {
-+      "name": "pentium-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-9.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "hda-duplex",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "amd-iommu-iommu-memory-region",
-+      "parent": "iommu-memory-region"
-+    },
-+    {
-+      "name": "can-bus",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "pvpanic-pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Cooperlake-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Cascadelake-Server-v3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-rng-pci",
-+      "parent": "vhost-user-rng-pci-base"
-+    },
-+    {
-+      "name": "Nehalem-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-balloon-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "chardev-null",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "cfi.pflash01",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "Skylake-Server-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-2.7-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "isa-parallel",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pentium2-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "xen-platform",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "isa-vga",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "EPYC-Rome-v4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "EPYC-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-vga-gl",
-+      "parent": "virtio-vga-gl-base-type"
-+    },
-+    {
-+      "name": "cxl-upstream",
-+      "parent": "pcie-port"
-+    },
-+    {
-+      "name": "i440FX-pcihost",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "isa-debugcon",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "qxl-vga",
-+      "parent": "pci-qxl"
-+    },
-+    {
-+      "name": "tls-creds-anon",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "cxl-downstream",
-+      "parent": "pcie-slot"
-+    },
-+    {
-+      "name": "rng-egd",
-+      "parent": "rng-backend"
-+    },
-+    {
-+      "name": "Cascadelake-Server-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82558b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ivshmem-doorbell",
-+      "parent": "ivshmem-common"
-+    },
-+    {
-+      "name": "chardev-hub",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-iommu-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "virtio-net-pci",
-+      "parent": "virtio-net-pci-base"
-+    },
-+    {
-+      "name": "virtio-vga",
-+      "parent": "virtio-vga-base-type"
-+    },
-+    {
-+      "name": "i82558a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "loader",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "usb-serial",
-+      "parent": "usb-serial-dev"
-+    },
-+    {
-+      "name": "pvscsi",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Denverton-v3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-i440fx-5.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "memory-backend-shm",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "accel",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "i82801",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-mem-pci",
-+      "parent": "virtio-mem-pci-base"
-+    },
-+    {
-+      "name": "SierraForest-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-pmem-pci",
-+      "parent": "virtio-pmem-pci-base"
-+    },
-+    {
-+      "name": "virtio-tablet-pci",
-+      "parent": "virtio-tablet-pci-base-type"
-+    },
-+    {
-+      "name": "EPYC-Milan-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "dc390",
-+      "parent": "am53c974"
-+    },
-+    {
-+      "name": "ClearwaterForest-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i6300esb",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Cascadelake-Server-v5-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "floppy",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "authz-list",
-+      "parent": "authz"
-+    },
-+    {
-+      "name": "pc-i440fx-4.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "Opteron_G4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "EPYC-v4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "chardev-qemu-vdagent",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "vhost-user-snd",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "vhost-user-fs-pci",
-+      "parent": "vhost-user-fs-pci-base"
-+    },
-+    {
-+      "name": "sb16",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "ich9-ahci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-i440fx-2.5-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-user-scsi-pci-transitional",
-+      "parent": "vhost-user-scsi-pci-base"
-+    },
-+    {
-+      "name": "Westmere-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vmbus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "chardev-pipe",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "i2c-ddc",
-+      "parent": "i2c-slave"
-+    },
-+    {
-+      "name": "can-host-socketcan",
-+      "parent": "can-host"
-+    },
-+    {
-+      "name": "Skylake-Server-noTSX-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82562",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-q35-4.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "chardev-mux",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "pci-bridge-seat",
-+      "parent": "pci-bridge"
-+    },
-+    {
-+      "name": "kvm32-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "lsi53c895a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "qio-channel-block",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "pc-i440fx-6.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "SandyBridge-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "intel-hda",
-+      "parent": "intel-hda-generic"
-+    },
-+    {
-+      "name": "vmclock",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "base-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "GraniteRapids-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "hyperv-synic",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "Opteron_G1-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "kvm64-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "IDE",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "486-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pcie-root-port",
-+      "parent": "pcie-root-port-base"
-+    },
-+    {
-+      "name": "mptsas1068",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "scsi-block",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "chardev-spicevmc",
-+      "parent": "chardev-spice"
-+    },
-+    {
-+      "name": "Snowridge-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-vdpa-device-pci",
-+      "parent": "vhost-vdpa-device-pci-base"
-+    },
-+    {
-+      "name": "q35-pcihost",
-+      "parent": "pcie-host-bridge"
-+    },
-+    {
-+      "name": "legacy-reset",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "SapphireRapids-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-i440fx-2.12-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "SCSI",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "Penryn-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "hda-micro",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "ivshmem-flat",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pxb-cxl",
-+      "parent": "pxb-pcie"
-+    },
-+    {
-+      "name": "Dhyana-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "rng-builtin",
-+      "parent": "rng-backend"
-+    },
-+    {
-+      "name": "sd-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "filter-dump",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "virtio-blk-pci-transitional",
-+      "parent": "virtio-blk-pci-base"
-+    },
-+    {
-+      "name": "chardev-ringbuf",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-pci-bus",
-+      "parent": "virtio-bus"
-+    },
-+    {
-+      "name": "smbus-ipmi",
-+      "parent": "smbus-device"
-+    },
-+    {
-+      "name": "authz-pam",
-+      "parent": "authz"
-+    },
-+    {
-+      "name": "Skylake-Server-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-blk",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "nvme-subsys",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "SandyBridge-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-5.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "qio-channel-tls",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "GraniteRapids-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "chardev-stdio",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "piix4-isa",
-+      "parent": "pci-piix"
-+    },
-+    {
-+      "name": "Icelake-Server-v1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "max-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Dhyana-v2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    }
-+  ],
-+  "id": "libvirt-6"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-blk-pci"
-+  },
-+  "id": "libvirt-7"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lcyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "queue-size",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lheads",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-invalid",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lsecs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "secs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 65535,
-+      "name": "num-queues",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "cyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "min_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-blk-device>"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "heads",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "config-wce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "seg-max-adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "iothread-vq-mapping",
-+      "description": "IOThread virtqueue mapping list [{\"iothread\":\"<id>\", \"vqs\":[1,2,3,...]},...]",
-+      "type": "IOThreadVirtQueueMappingList"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "report-discard-granularity",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "opt_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 4194303,
-+      "name": "max-discard-sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "discard",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "discard_granularity",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "request-merging",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "write-zeroes",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4194303,
-+      "name": "max-write-zeroes-sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-failed",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "backend_defaults",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-enable-wce-if-config-wce",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-7"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-net-pci"
-+  },
-+  "id": "libvirt-8"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mac",
-+      "description": "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "gso",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 150000,
-+      "name": "x-txtimer",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "mq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "mrg_rxbuf",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "host_mtu",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "x-txburst",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "tx",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "rss",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_uso",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "status",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "failover",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-net-device>"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_mac_addr",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "tx_queue_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hash",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_guest_offloads",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_uso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": [],
-+      "name": "ebpf-rss-fds",
-+      "type": "list"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "guest_rsc_ext",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "duplex",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 300000,
-+      "name": "rsc_interval",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_announce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "netdev",
-+      "description": "ID of a netdev to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-mtu-bypass-backend",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_rx_extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "rx_queue_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_uso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_vlan",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "speed",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_rx",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-8"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-scsi-pci"
-+  },
-+  "id": "libvirt-9"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "hotplug",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "num_queues",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 65535,
-+      "name": "max_sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "param_change",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "virtqueue_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "seg_max_adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 128,
-+      "name": "cmd_per_lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-scsi-device>"
-+    }
-+  ],
-+  "id": "libvirt-9"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-net-ccw"
-+  },
-+  "id": "libvirt-10"
-+}
-+
-+{
-+  "id": "libvirt-10",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'virtio-net-ccw' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-scsi-ccw"
-+  },
-+  "id": "libvirt-11"
-+}
-+
-+{
-+  "id": "libvirt-11",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'virtio-scsi-ccw' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "vfio-pci"
-+  },
-+  "id": "libvirt-12"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "on",
-+      "name": "x-pre-copy-dirty-page-tracking",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-kvm-intx",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "migration-events",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "on",
-+      "name": "x-device-dirty-page-tracking",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "x-pci-sub-device-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "fd",
-+      "type": "string"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "enable-migration",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "skip-vsc-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "x-pci-device-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-kvm-msi",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "off",
-+      "name": "display",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "x-pci-sub-vendor-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-mmap",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "off",
-+      "name": "x-msix-relocation",
-+      "description": "off/auto/bar0/bar1/bar2/bar3/bar4/bar5",
-+      "type": "OffAutoPCIBAR"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-req",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-kvm-ioeventfd",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "x-pci-vendor-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-vfio-ioeventfd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-nv-gpudirect-clique",
-+      "description": "NVIDIA GPUDirect Clique ID (0 - 15)",
-+      "type": "uint4"
-+    },
-+    {
-+      "default-value": 1100,
-+      "name": "x-intx-mmap-timeout-ms",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "x-igd-gms",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "sysfsdev",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vf-token",
-+      "description": "UUID (aka GUID) or \"auto\" for random value (default)",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-vga",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-igd-opregion",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-kvm-msix",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommufd",
-+      "type": "link<iommufd>"
-+    },
-+    {
-+      "name": "host",
-+      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-geforce-quirks",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-balloon-allowed",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-12"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "scsi-hd"
-+  },
-+  "id": "libvirt-13"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": 4294967295,
-+      "name": "scsi-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "channel",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "secs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lcyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-invalid",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lsecs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 5,
-+      "name": "scsi_version",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "removable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ver",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 1073741824,
-+      "name": "max_unmap_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "cyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "min_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "product",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "rotation_rate",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "heads",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "dpofua",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "vendor",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 2147483647,
-+      "name": "max_io_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "quirk_mode_page_vendor_specific_apple",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "opt_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-emulated-scsi-request",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "discard_granularity",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "port_wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "port_index",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-failed",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lheads",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "device_id",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "backend_defaults",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-13"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "ide-hd"
-+  },
-+  "id": "libvirt-14"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": false,
-+      "name": "win2k-install-hack",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "unit",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lsecs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-invalid",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "model",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lheads",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "rotation_rate",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "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"
-+    },
-+    {
-+      "name": "ver",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "heads",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "discard_granularity",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "backend_defaults",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "cyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lcyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "opt_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "bios-chs-trans",
-+      "description": "Logical CHS translation algorithm, auto/none/lba/large/rechs",
-+      "type": "BiosAtaTranslation"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "min_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-failed",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "secs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-14"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "PIIX4_PM"
-+  },
-+  "id": "libvirt-15"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "acpi-pci-hotplug-with-bridge-support",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "smb_io_base",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "disable_s3",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "acpi-root-pci-hotplug",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "smm-enabled",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "disable_s4",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "memory-hotplug-support",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "smm-compat",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-not-migrate-acpi-index",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "s4_val",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "smi-irq[0]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "unnamed-gpio-out[0]",
-+      "type": "link<irq>"
-+    }
-+  ],
-+  "id": "libvirt-15"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "usb-redir"
-+  },
-+  "id": "libvirt-16"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "pcap",
-+      "type": "str"
-+    },
-+    {
-+      "name": "port",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "msos-desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "filter",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "streams",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "chardev",
-+      "description": "ID of a chardev to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "debug",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "suppress-remote-wake",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-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"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": 4294967295,
-+      "name": "iobase",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "delay",
-+      "name": "lost_tick_policy",
-+      "type": "LostTickPolicy"
-+    }
-+  ],
-+  "id": "libvirt-18"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "VGA"
-+  },
-+  "id": "libvirt-19"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "refresh_rate",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "global-vmstate",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "big-endian-framebuffer",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 16,
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "qemu-extended-regs",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "mmio",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "ymax",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "xmax",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "edid",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "xres",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-19"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "vmware-svga"
-+  },
-+  "id": "libvirt-20"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "global-vmstate",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 16,
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-20"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "qxl"
-+  },
-+  "id": "libvirt-21"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "global-vmstate",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 16,
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "vram64_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "vram_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "debug",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "max_outputs",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": 5,
-+      "name": "revision",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "cmdlog",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "ram_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 67108864,
-+      "name": "ram_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 67108864,
-+      "name": "vram_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "guestdebug",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 1024,
-+      "name": "surfaces",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-21"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-gpu-pci"
-+  },
-+  "id": "libvirt-22"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 3,
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 800,
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "edid",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "x-scanout-vmstate-version",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 268435456,
-+      "name": "max_hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "blob",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 1,
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 1280,
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-gpu-device>"
-+    }
-+  ],
-+  "id": "libvirt-22"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-gpu-device"
-+  },
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 1,
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 1280,
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "x-scanout-vmstate-version",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": 800,
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 268435456,
-+      "name": "max_hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "edid",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "blob",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hostmem",
-+      "type": "size"
-+    }
-+  ],
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "ICH9-LPC"
-+  },
-+  "id": "libvirt-24"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-smi-broadcast",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "noreboot",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "smm-enabled",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-smi-periodic-timer",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-smi-swsmi-timer",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "smm-compat",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-smi-cpu-hotplug",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-smi-cpu-hotunplug",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "acpi-pci-hotplug-with-bridge-support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gsi[12]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[16]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[13]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "rtc",
-+      "type": "child<mc146818rtc>"
-+    },
-+    {
-+      "name": "gsi[14]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "disable_s4",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "disable_s3",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "gsi[15]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "sci_int",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "acpi_disable_cmd",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "gsi[17]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "pm_io_base",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "gsi[18]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[19]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "enable_tco",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "s4_val",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "gsi[0]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "x-smi-negotiated-features",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "gsi[1]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[20]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gpe0_blk",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "gsi[21]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[2]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "x-keep-pci-slot-hpc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gsi[3]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[22]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gpe0_blk_len",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "gsi[4]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[23]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "acpi_enable_cmd",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "gsi[5]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[6]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "cpu-hotplug-legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gsi[7]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[8]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[10]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[9]",
-+      "type": "link<irq>"
-+    },
-+    {
-+      "name": "gsi[11]",
-+      "type": "link<irq>"
-+    }
-+  ],
-+  "id": "libvirt-24"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-pci"
-+  },
-+  "id": "libvirt-25"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "free-page-reporting",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "deflate-on-oom",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "page-poison",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats",
-+      "type": "guest statistics"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "qemu-4-0-config-size",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "free-page-hint",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-balloon-device>"
-+    }
-+  ],
-+  "id": "libvirt-25"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-ccw"
-+  },
-+  "id": "libvirt-26"
-+}
-+
-+{
-+  "id": "libvirt-26",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'virtio-balloon-ccw' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-device"
-+  },
-+  "id": "libvirt-27"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "deflate-on-oom",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "free-page-hint",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "page-poison",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "qemu-4-0-config-size",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "free-page-reporting",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
-+    },
-+    {
-+      "name": "guest-stats",
-+      "type": "guest statistics"
-+    }
-+  ],
-+  "id": "libvirt-27"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "intel-iommu"
-+  },
-+  "id": "libvirt-28"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "pt",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "device-iotlb",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "intremap",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "fs1gp",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "stale-tm",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-scalable-mode",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "dma-translation",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "caching-mode",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 48,
-+      "name": "aw-bits",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "eim",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "version",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-buggy-eim",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pasid-mode",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-flts",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "dma-drain",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "snoop-control",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-28"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "mch"
-+  },
-+  "id": "libvirt-29"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "smbase-smram",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 16,
-+      "name": "extended-tseg-mbytes",
-+      "type": "uint16"
-+    }
-+  ],
-+  "id": "libvirt-29"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "nvdimm"
-+  },
-+  "id": "libvirt-30"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "memdev",
-+      "type": "link<memory-backend>"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "node",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "addr",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "slot",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "unarmed",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "uuid",
-+      "type": "QemuUUID"
-+    },
-+    {
-+      "name": "label-size",
-+      "type": "int"
-+    },
-+    {
-+      "name": "size",
-+      "type": "uint64"
-+    }
-+  ],
-+  "id": "libvirt-30"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "pcie-root-port"
-+  },
-+  "id": "libvirt-31"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pci-express-writeable-slt-bug",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "port",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": 8,
-+      "name": "aer_log_max",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-do-not-expose-native-hotplug-cap",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "hotplug",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "slot",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "chassis",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "power_controller_present",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-acs",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 18446744073709551615,
-+      "name": "mem-reserve",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 18446744073709551615,
-+      "name": "pref64-reserve",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "bus-reserve",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "32",
-+      "name": "x-width",
-+      "description": "1/2/4/8/12/16/32",
-+      "type": "PCIELinkWidth"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-migrate-msix",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 18446744073709551615,
-+      "name": "io-reserve",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": "16",
-+      "name": "x-speed",
-+      "description": "2_5/5/8/16/32/64",
-+      "type": "PCIELinkSpeed"
-+    },
-+    {
-+      "default-value": 18446744073709551615,
-+      "name": "pref32-reserve",
-+      "type": "size"
-+    }
-+  ],
-+  "id": "libvirt-31"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "usb-host"
-+  },
-+  "id": "libvirt-32"
-+}
-+
-+{
-+  "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": true,
-+      "name": "pipeline",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hostbus",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 4,
-+      "name": "isobufs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "vendorid",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "productid",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hostport",
-+      "type": "str"
-+    },
-+    {
-+      "name": "hostdevice",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hostaddr",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "suppress-remote-wake",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "loglevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 32,
-+      "name": "isobsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "guest-resets-all",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest-reset",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-32"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "vhost-user-fs-device"
-+  },
-+  "id": "libvirt-33"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "chardev",
-+      "description": "ID of a chardev to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 128,
-+      "name": "queue-size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "tag",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 1,
-+      "name": "num-request-queues",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-33"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-mem-pci"
-+  },
-+  "id": "libvirt-34"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "memaddr",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "memdev",
-+      "type": "link<memory-backend>"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-early-migration",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "node",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "requested-size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "block-size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "prealloc",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "on",
-+      "name": "unplugged-inaccessible",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "dynamic-memslots",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-mem>"
-+    }
-+  ],
-+  "id": "libvirt-34"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-iommu-pci"
-+  },
-+  "id": "libvirt-35"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": [],
-+      "name": "reserved-regions",
-+      "type": "list"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "host",
-+      "name": "granule",
-+      "description": "granule_mode values, 4k, 8k, 16k, 64k, host",
-+      "type": "GranuleMode"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "boot-bypass",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "primary-bus",
-+      "type": "link<PCI>"
-+    },
-+    {
-+      "default-value": 64,
-+      "name": "aw-bits",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-iommu-device>"
-+    }
-+  ],
-+  "id": "libvirt-35"
-+}
-+
-+{
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "memory-backend-file"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "type",
-+      "type": "string"
-+    },
-+    {
-+      "name": "share",
-+      "description": "Mark the memory as private to QEMU or shared",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "size",
-+      "description": "Size of the memory region (ex: 500M)",
-+      "type": "int"
-+    },
-+    {
-+      "name": "dump",
-+      "description": "Set to 'off' to exclude from core dump",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "prealloc-threads",
-+      "description": "Number of CPU threads to use for prealloc",
-+      "type": "int"
-+    },
-+    {
-+      "name": "x-use-canonical-path-for-ramblock-id",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "policy",
-+      "description": "Set the NUMA policy",
-+      "type": "HostMemPolicy"
-+    },
-+    {
-+      "name": "prealloc-context",
-+      "description": "Context to use for creating CPU threads for preallocation",
-+      "type": "link<thread-context>"
-+    },
-+    {
-+      "name": "prealloc",
-+      "description": "Preallocate memory",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "reserve",
-+      "description": "Reserve swap space (or huge pages) if applicable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-nodes",
-+      "description": "Binds memory to the list of NUMA host nodes",
-+      "type": "int"
-+    },
-+    {
-+      "name": "merge",
-+      "description": "Mark memory as mergeable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pmem",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "align",
-+      "type": "int"
-+    },
-+    {
-+      "name": "offset",
-+      "description": "Offset into the target file (ex: 1G)",
-+      "type": "int"
-+    },
-+    {
-+      "name": "mem-path",
-+      "type": "string"
-+    },
-+    {
-+      "name": "rom",
-+      "description": "Whether to create Read Only Memory (ROM)",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "discard-data",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "readonly",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "memory-backend-memfd"
-+  },
-+  "id": "libvirt-37"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "type",
-+      "type": "string"
-+    },
-+    {
-+      "name": "share",
-+      "description": "Mark the memory as private to QEMU or shared",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "size",
-+      "description": "Size of the memory region (ex: 500M)",
-+      "type": "int"
-+    },
-+    {
-+      "name": "dump",
-+      "description": "Set to 'off' to exclude from core dump",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "prealloc-threads",
-+      "description": "Number of CPU threads to use for prealloc",
-+      "type": "int"
-+    },
-+    {
-+      "name": "x-use-canonical-path-for-ramblock-id",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "policy",
-+      "description": "Set the NUMA policy",
-+      "type": "HostMemPolicy"
-+    },
-+    {
-+      "name": "prealloc-context",
-+      "description": "Context to use for creating CPU threads for preallocation",
-+      "type": "link<thread-context>"
-+    },
-+    {
-+      "name": "prealloc",
-+      "description": "Preallocate memory",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "reserve",
-+      "description": "Reserve swap space (or huge pages) if applicable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-nodes",
-+      "description": "Binds memory to the list of NUMA host nodes",
-+      "type": "int"
-+    },
-+    {
-+      "name": "merge",
-+      "description": "Mark memory as mergeable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hugetlb",
-+      "description": "Use huge pages",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "seal",
-+      "description": "Seal growing & shrinking",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hugetlbsize",
-+      "description": "Huge pages size (ex: 2M, 1G)",
-+      "type": "int"
-+    }
-+  ],
-+  "id": "libvirt-37"
-+}
-+
-+{
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "max-x86_64-cpu"
-+  },
-+  "id": "libvirt-38"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "type",
-+      "type": "string"
-+    },
-+    {
-+      "name": "parent_bus",
-+      "type": "link<bus>"
-+    },
-+    {
-+      "name": "realized",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hotplugged",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hotpluggable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "memory",
-+      "type": "link<memory-region>"
-+    },
-+    {
-+      "name": "legacy-memory",
-+      "type": "str"
-+    },
-+    {
-+      "name": "start-powered-off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-invept-single-context",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "core-capability",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "popcnt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sgx-debug",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-poll-control",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dtes64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-invvpid-single-addr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xstore",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "min-xlevel2",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "stepping",
-+      "type": "int"
-+    },
-+    {
-+      "name": "vmx-vmfunc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sm4",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-emsr-bitmap",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pse36",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-4vnniw",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-intel-pt-auto-level",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fma4",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-vp2intersect",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "amd-psfd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "amd-stibp",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sgxlc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sm3",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "family",
-+      "type": "int"
-+    },
-+    {
-+      "name": "vmx-ept-advanced-exitinfo",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "vmware-cpuid-freq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-store-lma",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "hv-spinlocks",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ddpd-u",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-nested-exception",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-entry-noload-debugctl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bhi-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "amx-fp16",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "erms",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vaes",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-eptad",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-activity-wait-sipi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-flexpriority",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdrand",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lam",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-pause-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-shadow-vmcs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "model",
-+      "type": "int"
-+    },
-+    {
-+      "name": "avx512-vpopcntdq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xcrypt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tbm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "movdiri",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-monitor-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-eoi",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hv-version-id-spack",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "lm",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-vendor-cpuid-only",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pbrsb-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-unrestricted-guest",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "host-phys-bits-limit",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "pae",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ssse3",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-runtime",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "phe",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "guest-phys-bits",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "host-phys-bits",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "taa-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sgx-aex-notify",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "full-width-write",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "arat",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vbmi2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sha512",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "arch-lbr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-vnmi-pending",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-any-errcode",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x2apic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "npt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pmm-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-invpcid-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512ifma",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibpb-brtype",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "model-id",
-+      "type": "string"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "ucode-rev",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-evmcs",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "srso-user-kernel-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-io-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-force-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-ins-outs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dca",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-apicv-x2apic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr-core",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ia64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fdp-excptn-only",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-stimer-direct",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gds-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-exit-secondary-ctls",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-cr3-load-noexit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rfds-no",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "pmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-entry-load-rtit-ctl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvmclock",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx10",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-invept-single-context-noglobals",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "xen-vapic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "invtsc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pn",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512cd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "md-clear",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmp-legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cx16",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512dq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "abm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-activity-shutdown",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "auto-ibrs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-ipi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx10-128",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-apicv-register",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fxsr-opt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "skip-l1dfl-vmentry",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "fill-mtrr-mask",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-migrate-smi-count",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "wbnoinvd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdpid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pcid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bhi-ctrl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "syscall",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rrsba-ctrl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx-ne-convert",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsaves",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-entry-load-pat",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vgif",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xfd",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "node-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "sgx-tokenkey",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibpb",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-amd-topoext-features-only",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-apicv-xapic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-hlt-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lwp",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "eraps",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cldemote",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-exit-load-pkrs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rtm",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-tlbflush",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-steal-time",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "cpuid-0xb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fsrs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sgx-provisionkey",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-eptp-switching",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-invlpg-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-entry-load-efer",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "level-func7",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "die-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "vmx-exit-save-efer",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-l1-cache-per-thread",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vme",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-unhalt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-desc-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sgx-kss",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-invvpid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-entry-ia32e-mode",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-hint-dedicated",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-ept-execonly",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "module-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "avx-ifma",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mca",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-tsc-scaling",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mtrr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pfthreshold",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pmm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lahf-lm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "zero-fcs-fds",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 14393,
-+      "name": "hv-version-id-build",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vmx-entry-load-pkrs",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "tcg-cpuid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "no-nested-data-bp",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "legacy-multi-node",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "x-hv-max-vps",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "tm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pbe",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "amx-int8",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sgx1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "intel-psfd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-rdpmc-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "split-lock-detect",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "apic-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "fpu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "skinit",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "l3-cache",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sep",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-exit-load-pat",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "intel-pt-lip",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx10-512",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-tlbflush-direct",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-bf16",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "overflow-recov",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-vnmi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-rdtscp-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "amx-complex",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-invvpid-all-context",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx-vnni-int8",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-vmwrite-vmexit-fields",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-page-walk-4",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rfds-clear",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pause-filter",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds-cpl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "succor",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fred",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fsrm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-exit-load-efer",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-mtf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-entry-load-fred",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-ept",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fb-clear",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nodeid-msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-exit-clear-bndcfgs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smap",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-io-bitmap",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-preemption-timer",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-invept-all-context",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-intr-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "prefetchiti",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "psdp-no",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "xlevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "cr8legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-vpid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-zero-len-inject",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pschange-mc-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virt-ssbd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "umip",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512er",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-vintr-pending",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xstore-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibrs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rsba",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmov",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-posted-intr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xcrypt-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tm2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lbrv",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc-scale",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-secondary-ctls",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsaveerptr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fsgsbase",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-hv-synic-kvm-only",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512bw",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hv-version-id-minor",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "tce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc-frequency",
-+      "type": "int"
-+    },
-+    {
-+      "name": "smx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hle",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "monitor",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-fp16",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4a",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vpclmulqdq",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-frequencies",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-tlb-flush",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-rdtsc-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-activity-hlt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sgx-edeccssa",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsavec",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-cr8-load-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mds-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svme-addr-chk",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "amd-no-ssb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xop",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "adx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfmon-v2",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hv-version-id-sbranch",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "crash-information",
-+      "type": "GuestPanicInformation"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "min-level",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "full-cpuid-auto-level",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-entry-load-bndcfgs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-rdseed-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pclmulqdq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "wrmsrns",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "kvm-pv-enforce-cpuid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ssb-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clflush",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mpx",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "xlevel2",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "extapic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lfence-always-serializing",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-enforce-cpuid",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-stimer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sgx2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-asyncpf-vmexit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smep",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vnmi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-mwait-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-synic",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cx8",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmcb-clean",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pku",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "kvm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "srso-no",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-passthrough",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lkgs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsx-ldtrk",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-tlbflush-ext",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "stibp",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-cr3-store-noexit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsx-ctrl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm-lock",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-reenlightenment",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clzero",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avic",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-vpindex",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "osvw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sgx-exinfo",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "legacy-cache",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fsrc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pks",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-ept-2mb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-true-ctls",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "movdir64b",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-ept-1gb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-invept",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-rdrand-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "acpi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-encls-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-cr8-store-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sbdr-ssdp-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ipred-ctrl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-mmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "3dnowprefetch",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nrip-save",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gfni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "flush-l1d",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-msi-ext-dest-id",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fzrm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "serialize",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512bitalg",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdseed",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sha-ni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ace2",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "lmce",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "avx10-version",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "topoext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "f16c",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "waitpkg",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-4fmaps",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fbsdp-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdctl-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mmx",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 10,
-+      "name": "hv-version-id-major",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "level",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "avx512vnni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "movbe",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-ple",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mmxext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lbr-fmt",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "bus-lock-detect",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-apicv-vid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-page-walk-5",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "flushbyasid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdtscp",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clwb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-sched-yield",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-asyncpf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx-vnni-int16",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "decodeassists",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-wbinvd-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pat",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-exit-clear-rtit-ctl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "invpcid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pdpe1gb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-exit-save-pat",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "unavailable-features",
-+      "type": "strList"
-+    },
-+    {
-+      "name": "tsc-adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-enable-user-wait-pause",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ht",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "amx-tile",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clflushopt",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-xmm-input",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-tsc-offset",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ssbd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "3dnowext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xtpr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sgx",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-crash",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsave",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pdcm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-vendor-id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "est",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vendor",
-+      "type": "string"
-+    },
-+    {
-+      "name": "pge",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pcommit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc-deadline",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sgx-mode64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvmclock-stable-bit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "misalignsse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-msr-bitmap",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-time",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr-nb",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-avic",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "phys-bits",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "apic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-exit-save-preemption-timer",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-exit-ack-intr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-nmi-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vbmi",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "thread-id",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "min-xlevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "socket-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "vmx-exit-nosave-debugctl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "arch-capabilities",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-xsaves",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bmi2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512f",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-exit-load-perf-global-ctrl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-pml",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-entry-load-perf-global-ctrl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ace2-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "wdt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "intel-pt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-nopiodelay",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmpccxadd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "v-vmsave-vmload",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512pf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bmi1",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "enforce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4.2",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-syndbg",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibrs-all",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xgetbv1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mcdt-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "spec-ctrl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "3dnow",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-asyncpf-int",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "la57",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "off",
-+      "name": "hv-no-nonarch-coresharing",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "amx-bf16",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4.1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsaveopt",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-relaxed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hv-version-id-snumber",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "stibp-always-on",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sbpb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx-vnni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fxsr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "phe-en",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-vapic",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-ipi",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "null-sel-clr-base",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hypervisor",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx10-256",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "aes",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "amd-ssbd",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "core-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "de",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ss",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx-movdr-exit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fma",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "host-cache-info",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migratable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lahf_lm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc_adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm_lock",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmcb_clean",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nrip_save",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lbr_fmt",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "pclmuldq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ffxsr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4-2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_asyncpf_int",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmp_legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_nopiodelay",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr_core",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_pv_unhalt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds_cpl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4-1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr_nb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse3",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc_scale",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pause_filter",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_asyncpf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_steal_time",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "feature-words",
-+      "type": "X86CPUFeatureWordInfo"
-+    },
-+    {
-+      "name": "kvm_mmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "filtered-features",
-+      "type": "X86CPUFeatureWordInfo"
-+    },
-+    {
-+      "name": "sse4_2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_poll_control",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fxsr_opt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nodeid_msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_pv_eoi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "i64",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hv-apicv",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4_1",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-38"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-39"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-5.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.12",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-6.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-4.2",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.5",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-4.2",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-5.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.7",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-9.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 4096,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-7.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-8.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 1024,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "none",
-+      "numa-mem-supported": false,
-+      "acpi": false,
-+      "cpu-max": 1,
-+      "deprecated": false,
-+      "default-ram-id": "ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-8.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.7",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-6.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-9.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.4",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-10.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 4096,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram",
-+      "alias": "q35"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-7.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.10",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "x-remote",
-+      "numa-mem-supported": false,
-+      "acpi": false,
-+      "cpu-max": 1,
-+      "deprecated": false
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-5.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.9",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.11",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-3.1",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-6.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-4.1",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.4",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-4.1",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-5.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.9",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "isapc",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "486-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 1,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.6",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-3.1",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-9.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 4096,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.12",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-7.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-8.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-8.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-6.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.6",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-9.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-4.0.1",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-7.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-5.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.8",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-10.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "is-default": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram",
-+      "alias": "pc"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-9.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 4096,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.10",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-3.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-7.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-4.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-6.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "microvm",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": false,
-+      "default-ram-id": "microvm.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-8.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 1024,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-4.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-8.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-5.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.8",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-6.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-9.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-3.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.5",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-7.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.11",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    }
-+  ],
-+  "id": "libvirt-39"
-+}
-+
-+{
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "none-machine"
-+  },
-+  "id": "libvirt-40"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "type",
-+      "type": "string"
-+    },
-+    {
-+      "name": "kernel",
-+      "description": "Linux kernel image file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "dt-compatible",
-+      "description": "Overrides the \"compatible\" property of the dt root node",
-+      "type": "string"
-+    },
-+    {
-+      "name": "boot",
-+      "description": "Boot configuration",
-+      "type": "BootConfiguration"
-+    },
-+    {
-+      "name": "memory",
-+      "description": "Memory size configuration",
-+      "type": "MemorySizeConfiguration"
-+    },
-+    {
-+      "name": "initrd",
-+      "description": "Linux initial ramdisk file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "confidential-guest-support",
-+      "description": "Set confidential guest scheme to support",
-+      "type": "link<confidential-guest-support>"
-+    },
-+    {
-+      "name": "aux-ram-share",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "graphics",
-+      "description": "Set on/off to enable/disable graphics emulation",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "usb",
-+      "description": "Set on/off to enable/disable usb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "firmware",
-+      "description": "Firmware image",
-+      "type": "string"
-+    },
-+    {
-+      "name": "memory-encryption",
-+      "description": "Set memory encryption object to use",
-+      "type": "string"
-+    },
-+    {
-+      "name": "dump-guest-core",
-+      "description": "Include guest memory in a core dump",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smp",
-+      "description": "CPU topology",
-+      "type": "SMPConfiguration"
-+    },
-+    {
-+      "name": "shim",
-+      "description": "shim.efi file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "smp-cache",
-+      "description": "Cache properties list for SMP machine",
-+      "type": "SmpCachePropertiesWrapper"
-+    },
-+    {
-+      "name": "dumpdtb",
-+      "description": "Dump current dtb to a file and quit",
-+      "type": "string"
-+    },
-+    {
-+      "name": "phandle-start",
-+      "description": "The first phandle ID we may generate dynamically",
-+      "type": "int"
-+    },
-+    {
-+      "name": "memory-backend",
-+      "description": "Set RAM backendValid value is ID of hostmem based backend",
-+      "type": "link<memory-backend>"
-+    },
-+    {
-+      "name": "mem-merge",
-+      "description": "Enable/disable memory merge support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dtb",
-+      "description": "Linux kernel device tree file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "append",
-+      "description": "Linux kernel command line",
-+      "type": "string"
-+    },
-+    {
-+      "name": "suppress-vmdesc",
-+      "description": "Set on to disable self-describing migration",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-40"
-+}
-+
-+{
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "generic-pc-machine"
-+  },
-+  "id": "libvirt-41"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "type",
-+      "type": "string"
-+    },
-+    {
-+      "name": "kernel",
-+      "description": "Linux kernel image file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "dt-compatible",
-+      "description": "Overrides the \"compatible\" property of the dt root node",
-+      "type": "string"
-+    },
-+    {
-+      "name": "boot",
-+      "description": "Boot configuration",
-+      "type": "BootConfiguration"
-+    },
-+    {
-+      "name": "memory",
-+      "description": "Memory size configuration",
-+      "type": "MemorySizeConfiguration"
-+    },
-+    {
-+      "name": "initrd",
-+      "description": "Linux initial ramdisk file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "confidential-guest-support",
-+      "description": "Set confidential guest scheme to support",
-+      "type": "link<confidential-guest-support>"
-+    },
-+    {
-+      "name": "aux-ram-share",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "graphics",
-+      "description": "Set on/off to enable/disable graphics emulation",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "usb",
-+      "description": "Set on/off to enable/disable usb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "firmware",
-+      "description": "Firmware image",
-+      "type": "string"
-+    },
-+    {
-+      "name": "memory-encryption",
-+      "description": "Set memory encryption object to use",
-+      "type": "string"
-+    },
-+    {
-+      "name": "dump-guest-core",
-+      "description": "Include guest memory in a core dump",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smp",
-+      "description": "CPU topology",
-+      "type": "SMPConfiguration"
-+    },
-+    {
-+      "name": "shim",
-+      "description": "shim.efi file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "smp-cache",
-+      "description": "Cache properties list for SMP machine",
-+      "type": "SmpCachePropertiesWrapper"
-+    },
-+    {
-+      "name": "dumpdtb",
-+      "description": "Dump current dtb to a file and quit",
-+      "type": "string"
-+    },
-+    {
-+      "name": "phandle-start",
-+      "description": "The first phandle ID we may generate dynamically",
-+      "type": "int"
-+    },
-+    {
-+      "name": "memory-backend",
-+      "description": "Set RAM backendValid value is ID of hostmem based backend",
-+      "type": "link<memory-backend>"
-+    },
-+    {
-+      "name": "mem-merge",
-+      "description": "Enable/disable memory merge support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dtb",
-+      "description": "Linux kernel device tree file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "append",
-+      "description": "Linux kernel command line",
-+      "type": "string"
-+    },
-+    {
-+      "name": "suppress-vmdesc",
-+      "description": "Set on to disable self-describing migration",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smm",
-+      "description": "Enable SMM",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "acpi",
-+      "description": "Enable ACPI",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "pit",
-+      "description": "Enable i8254 PIT",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "pic",
-+      "description": "Enable i8259 PIC",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "x-oem-table-id",
-+      "description": "Override the default value of field OEM Table ID in ACPI table header.The string may be up to 8 bytes in size",
-+      "type": "string"
-+    },
-+    {
-+      "name": "bus-lock-ratelimit",
-+      "description": "Set the ratelimit for the bus locks acquired in VMs",
-+      "type": "uint64_t"
-+    },
-+    {
-+      "name": "sgx-epc",
-+      "description": "SGX EPC device",
-+      "type": "SgxEPC"
-+    },
-+    {
-+      "name": "x-oem-id",
-+      "description": "Override the default value of field OEMID in ACPI table header.The string may be up to 6 bytes in size",
-+      "type": "string"
-+    },
-+    {
-+      "name": "max-fw-size",
-+      "description": "Maximum combined firmware size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "default-bus-bypass-iommu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sata",
-+      "description": "Enable/disable Serial ATA bus",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmport",
-+      "description": "Enable vmport (pc & q35)",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "i8042",
-+      "description": "Enable/disable Intel 8042 PS/2 controller emulation",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hpet",
-+      "description": "Enable/disable high precision event timer emulation",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smbios-entry-point-type",
-+      "description": "SMBIOS Entry Point type [32, 64]",
-+      "type": "str"
-+    },
-+    {
-+      "name": "max-ram-below-4g",
-+      "description": "Maximum ram below the 4G boundary (32bit boundary)",
-+      "type": "size"
-+    },
-+    {
-+      "name": "fd-bootchk",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smbus",
-+      "description": "Enable/disable system management bus",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-41"
-+}
-+
-+{
-+  "execute": "query-cpu-definitions",
-+  "id": "libvirt-42"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "max",
-+      "typename": "max-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "qemu64-v1",
-+      "typename": "qemu64-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "qemu64-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "qemu32-v1",
-+      "typename": "qemu32-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "qemu32-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "phenom-v1",
-+      "typename": "phenom-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "alias-of": "phenom-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium3-v1",
-+      "typename": "pentium3-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "pentium3-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium2-v1",
-+      "typename": "pentium2-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "pentium2-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium-v1",
-+      "typename": "pentium-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "pentium-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "n270-v1",
-+      "typename": "n270-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss"
-+      ],
-+      "alias-of": "n270-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "kvm64-v1",
-+      "typename": "kvm64-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "kvm64-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "kvm32-v1",
-+      "typename": "kvm32-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "kvm32-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "coreduo-v1",
-+      "typename": "coreduo-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss"
-+      ],
-+      "alias-of": "coreduo-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "core2duo-v1",
-+      "typename": "core2duo-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss"
-+      ],
-+      "alias-of": "core2duo-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "athlon-v1",
-+      "typename": "athlon-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "alias-of": "athlon-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Westmere-v2",
-+      "typename": "Westmere-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Westmere-v1",
-+      "typename": "Westmere-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Westmere-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Westmere-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Snowridge-v4",
-+      "typename": "Snowridge-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms",
-+        "gfni",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "spec-ctrl",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Snowridge-v3",
-+      "typename": "Snowridge-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms",
-+        "gfni",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "spec-ctrl",
-+        "core-capability",
-+        "xsaves",
-+        "split-lock-detect"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Snowridge-v2",
-+      "typename": "Snowridge-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms",
-+        "gfni",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "spec-ctrl",
-+        "core-capability",
-+        "split-lock-detect"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Snowridge-v1",
-+      "typename": "Snowridge-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms",
-+        "mpx",
-+        "gfni",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "spec-ctrl",
-+        "core-capability",
-+        "split-lock-detect"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Snowridge",
-+      "typename": "Snowridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms",
-+        "mpx",
-+        "gfni",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "spec-ctrl",
-+        "core-capability",
-+        "split-lock-detect"
-+      ],
-+      "alias-of": "Snowridge-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-v5",
-+      "typename": "Skylake-Server-v5-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "spec-ctrl",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-v4",
-+      "typename": "Skylake-Server-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-v3",
-+      "typename": "Skylake-Server-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-v2",
-+      "typename": "Skylake-Server-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-v1",
-+      "typename": "Skylake-Server-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-noTSX-IBRS",
-+      "typename": "Skylake-Server-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Skylake-Server-v3",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS",
-+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Skylake-Server-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku"
-+      ],
-+      "alias-of": "Skylake-Server-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-v4",
-+      "typename": "Skylake-Client-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "spec-ctrl",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-v3",
-+      "typename": "Skylake-Client-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-v2",
-+      "typename": "Skylake-Client-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-v1",
-+      "typename": "Skylake-Client-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-noTSX-IBRS",
-+      "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Skylake-Client-v3",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Skylake-Client-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "alias-of": "Skylake-Client-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SierraForest-v2",
-+      "typename": "SierraForest-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss",
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "pku",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "bus-lock-detect",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "fsrm",
-+        "serialize",
-+        "spec-ctrl",
-+        "avx-vnni",
-+        "cmpccxadd",
-+        "fsrs",
-+        "avx-ifma",
-+        "lam",
-+        "xsaves",
-+        "ibrs-all",
-+        "sbdr-ssdp-no",
-+        "fbsdp-no",
-+        "psdp-no",
-+        "pbrsb-no",
-+        "avx-vnni-int8",
-+        "avx-ne-convert",
-+        "intel-psfd",
-+        "ipred-ctrl",
-+        "rrsba-ctrl",
-+        "bhi-ctrl",
-+        "mcdt-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SierraForest-v1",
-+      "typename": "SierraForest-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "pku",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "bus-lock-detect",
-+        "fsrm",
-+        "serialize",
-+        "spec-ctrl",
-+        "avx-vnni",
-+        "cmpccxadd",
-+        "fsrs",
-+        "avx-ifma",
-+        "xsaves",
-+        "ibrs-all",
-+        "sbdr-ssdp-no",
-+        "fbsdp-no",
-+        "psdp-no",
-+        "pbrsb-no",
-+        "avx-vnni-int8",
-+        "avx-ne-convert",
-+        "mcdt-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SierraForest",
-+      "typename": "SierraForest-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "pku",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "bus-lock-detect",
-+        "fsrm",
-+        "serialize",
-+        "spec-ctrl",
-+        "avx-vnni",
-+        "cmpccxadd",
-+        "fsrs",
-+        "avx-ifma",
-+        "xsaves",
-+        "ibrs-all",
-+        "sbdr-ssdp-no",
-+        "fbsdp-no",
-+        "psdp-no",
-+        "pbrsb-no",
-+        "avx-vnni-int8",
-+        "avx-ne-convert",
-+        "mcdt-no"
-+      ],
-+      "alias-of": "SierraForest-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SapphireRapids-v3",
-+      "typename": "SapphireRapids-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss",
-+        "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",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "fsrm",
-+        "serialize",
-+        "tsx-ldtrk",
-+        "amx-bf16",
-+        "avx512-fp16",
-+        "amx-tile",
-+        "amx-int8",
-+        "spec-ctrl",
-+        "avx-vnni",
-+        "avx512-bf16",
-+        "fzrm",
-+        "fsrs",
-+        "fsrc",
-+        "xsaves",
-+        "xfd",
-+        "ibrs-all",
-+        "taa-no",
-+        "sbdr-ssdp-no",
-+        "fbsdp-no",
-+        "psdp-no"
-+      ],
-+      "static": false,
-+      "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",
-+        "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",
-+      "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",
-+        "ibrs-all",
-+        "taa-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SapphireRapids",
-+      "typename": "SapphireRapids-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",
-+        "ibrs-all",
-+        "taa-no"
-+      ],
-+      "alias-of": "SapphireRapids-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SandyBridge-v2",
-+      "typename": "SandyBridge-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SandyBridge-v1",
-+      "typename": "SandyBridge-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "SandyBridge-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "SandyBridge-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Penryn-v1",
-+      "typename": "Penryn-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Penryn-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G5-v1",
-+      "typename": "Opteron_G5-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "alias-of": "Opteron_G5-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G4-v1",
-+      "typename": "Opteron_G4-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "xop",
-+        "fma4"
-+      ],
-+      "alias-of": "Opteron_G4-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G3-v1",
-+      "typename": "Opteron_G3-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Opteron_G3-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G2-v1",
-+      "typename": "Opteron_G2-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Opteron_G2-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G1-v1",
-+      "typename": "Opteron_G1-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Opteron_G1-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Nehalem-v2",
-+      "typename": "Nehalem-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Nehalem-v1",
-+      "typename": "Nehalem-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Nehalem-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Nehalem-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "KnightsMill-v1",
-+      "typename": "KnightsMill-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss",
-+        "erms",
-+        "avx512f",
-+        "avx512pf",
-+        "avx512er",
-+        "avx512cd",
-+        "avx512-vpopcntdq",
-+        "avx512-4vnniw",
-+        "avx512-4fmaps"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "KnightsMill",
-+      "typename": "KnightsMill-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss",
-+        "erms",
-+        "avx512f",
-+        "avx512pf",
-+        "avx512er",
-+        "avx512cd",
-+        "avx512-vpopcntdq",
-+        "avx512-4vnniw",
-+        "avx512-4fmaps"
-+      ],
-+      "alias-of": "KnightsMill-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "IvyBridge-v2",
-+      "typename": "IvyBridge-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "IvyBridge-v1",
-+      "typename": "IvyBridge-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "IvyBridge-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms"
-+      ],
-+      "alias-of": "IvyBridge-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v7",
-+      "typename": "Icelake-Server-v7-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",
-+        "fsrm",
-+        "spec-ctrl",
-+        "xsaves",
-+        "ibrs-all",
-+        "taa-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v6",
-+      "typename": "Icelake-Server-v6-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "pku",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "la57",
-+        "fsrm",
-+        "spec-ctrl",
-+        "xsaves",
-+        "ibrs-all",
-+        "taa-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v5",
-+      "typename": "Icelake-Server-v5-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "pku",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "la57",
-+        "fsrm",
-+        "spec-ctrl",
-+        "xsaves",
-+        "ibrs-all",
-+        "taa-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v4",
-+      "typename": "Icelake-Server-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "pku",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "la57",
-+        "fsrm",
-+        "spec-ctrl",
-+        "ibrs-all",
-+        "taa-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v3",
-+      "typename": "Icelake-Server-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "pku",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "la57",
-+        "spec-ctrl",
-+        "ibrs-all",
-+        "taa-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v2",
-+      "typename": "Icelake-Server-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "pku",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "la57",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v1",
-+      "typename": "Icelake-Server-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "pku",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "la57",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-noTSX",
-+      "typename": "Icelake-Server-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "pku",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "la57",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Icelake-Server-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server",
-+      "typename": "Icelake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "pku",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "la57",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Icelake-Server-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-v4",
-+      "typename": "Haswell-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-v3",
-+      "typename": "Haswell-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-v2",
-+      "typename": "Haswell-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-v1",
-+      "typename": "Haswell-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Haswell-v4",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid"
-+      ],
-+      "alias-of": "Haswell-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Haswell-v3",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "alias-of": "Haswell-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "GraniteRapids-v2",
-+      "typename": "GraniteRapids-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss",
-+        "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",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "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",
-+        "ibrs-all",
-+        "taa-no",
-+        "sbdr-ssdp-no",
-+        "fbsdp-no",
-+        "psdp-no",
-+        "pbrsb-no",
-+        "prefetchiti",
-+        "avx10",
-+        "mcdt-no",
-+        "avx10-128",
-+        "avx10-256",
-+        "avx10-512"
-+      ],
-+      "static": false,
-+      "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",
-+        "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",
-+        "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",
-+      "unavailable-features": [
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-v3",
-+      "typename": "EPYC-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-v2",
-+      "typename": "EPYC-v2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-v1",
-+      "typename": "EPYC-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Rome-v4",
-+      "typename": "EPYC-Rome-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "ibrs"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Rome-v3",
-+      "typename": "EPYC-Rome-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "ibrs",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Rome-v2",
-+      "typename": "EPYC-Rome-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "ibrs",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Rome-v1",
-+      "typename": "EPYC-Rome-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Rome",
-+      "typename": "EPYC-Rome-x86_64-cpu",
-+      "unavailable-features": [
-+        "xsaves"
-+      ],
-+      "alias-of": "EPYC-Rome-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Milan-v2",
-+      "typename": "EPYC-Milan-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "pku",
-+        "vaes",
-+        "vpclmulqdq",
-+        "fsrm",
-+        "ibrs",
-+        "stibp-always-on",
-+        "amd-psfd",
-+        "no-nested-data-bp",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Milan-v1",
-+      "typename": "EPYC-Milan-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "pku",
-+        "fsrm",
-+        "ibrs",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Milan",
-+      "typename": "EPYC-Milan-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "pku",
-+        "fsrm",
-+        "ibrs",
-+        "xsaves"
-+      ],
-+      "alias-of": "EPYC-Milan-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-IBPB",
-+      "typename": "EPYC-IBPB-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "EPYC-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Genoa-v1",
-+      "typename": "EPYC-Genoa-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "pku",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "la57",
-+        "fsrm",
-+        "avx512-bf16",
-+        "ibrs",
-+        "stibp-always-on",
-+        "amd-psfd",
-+        "no-nested-data-bp",
-+        "auto-ibrs",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Genoa",
-+      "typename": "EPYC-Genoa-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "pku",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "la57",
-+        "fsrm",
-+        "avx512-bf16",
-+        "ibrs",
-+        "stibp-always-on",
-+        "amd-psfd",
-+        "no-nested-data-bp",
-+        "auto-ibrs",
-+        "xsaves"
-+      ],
-+      "alias-of": "EPYC-Genoa-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "EPYC-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Dhyana-v2",
-+      "typename": "Dhyana-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Dhyana-v1",
-+      "typename": "Dhyana-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Dhyana",
-+      "typename": "Dhyana-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Dhyana-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Denverton-v3",
-+      "typename": "Denverton-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms",
-+        "spec-ctrl",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Denverton-v2",
-+      "typename": "Denverton-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Denverton-v1",
-+      "typename": "Denverton-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms",
-+        "mpx",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Denverton",
-+      "typename": "Denverton-x86_64-cpu",
-+      "unavailable-features": [
-+        "erms",
-+        "mpx",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Denverton-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cooperlake-v2",
-+      "typename": "Cooperlake-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "avx512-bf16",
-+        "xsaves",
-+        "ibrs-all",
-+        "taa-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cooperlake-v1",
-+      "typename": "Cooperlake-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "avx512-bf16",
-+        "ibrs-all",
-+        "taa-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cooperlake",
-+      "typename": "Cooperlake-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "avx512-bf16",
-+        "ibrs-all",
-+        "taa-no"
-+      ],
-+      "alias-of": "Cooperlake-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Conroe-v1",
-+      "typename": "Conroe-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Conroe-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "ClearwaterForest-v1",
-+      "typename": "ClearwaterForest-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss",
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "pku",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "bus-lock-detect",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "fsrm",
-+        "serialize",
-+        "spec-ctrl",
-+        "sha512",
-+        "sm3",
-+        "sm4",
-+        "avx-vnni",
-+        "cmpccxadd",
-+        "fsrs",
-+        "avx-ifma",
-+        "lam",
-+        "xsaves",
-+        "ibrs-all",
-+        "sbdr-ssdp-no",
-+        "fbsdp-no",
-+        "psdp-no",
-+        "bhi-no",
-+        "pbrsb-no",
-+        "avx-vnni-int8",
-+        "avx-ne-convert",
-+        "avx-vnni-int16",
-+        "prefetchiti",
-+        "intel-psfd",
-+        "ipred-ctrl",
-+        "rrsba-ctrl",
-+        "ddpd-u",
-+        "bhi-ctrl",
-+        "mcdt-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "ClearwaterForest",
-+      "typename": "ClearwaterForest-x86_64-cpu",
-+      "unavailable-features": [
-+        "ss",
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "pku",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "bus-lock-detect",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "fsrm",
-+        "serialize",
-+        "spec-ctrl",
-+        "sha512",
-+        "sm3",
-+        "sm4",
-+        "avx-vnni",
-+        "cmpccxadd",
-+        "fsrs",
-+        "avx-ifma",
-+        "lam",
-+        "xsaves",
-+        "ibrs-all",
-+        "sbdr-ssdp-no",
-+        "fbsdp-no",
-+        "psdp-no",
-+        "bhi-no",
-+        "pbrsb-no",
-+        "avx-vnni-int8",
-+        "avx-ne-convert",
-+        "avx-vnni-int16",
-+        "prefetchiti",
-+        "intel-psfd",
-+        "ipred-ctrl",
-+        "rrsba-ctrl",
-+        "ddpd-u",
-+        "bhi-ctrl",
-+        "mcdt-no"
-+      ],
-+      "alias-of": "ClearwaterForest-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-v5",
-+      "typename": "Cascadelake-Server-v5-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "xsaves",
-+        "ibrs-all"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-v4",
-+      "typename": "Cascadelake-Server-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "ibrs-all"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-v3",
-+      "typename": "Cascadelake-Server-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "ibrs-all"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-v2",
-+      "typename": "Cascadelake-Server-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "ibrs-all"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-v1",
-+      "typename": "Cascadelake-Server-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512vnni",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-noTSX",
-+      "typename": "Cascadelake-Server-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "ibrs-all"
-+      ],
-+      "alias-of": "Cascadelake-Server-v3",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server",
-+      "typename": "Cascadelake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512vnni",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Cascadelake-Server-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-v4",
-+      "typename": "Broadwell-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-v3",
-+      "typename": "Broadwell-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-v2",
-+      "typename": "Broadwell-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-v1",
-+      "typename": "Broadwell-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Broadwell-v4",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "erms",
-+        "invpcid"
-+      ],
-+      "alias-of": "Broadwell-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Broadwell-v3",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "hle",
-+        "erms",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "alias-of": "Broadwell-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "486-v1",
-+      "typename": "486-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "486-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    }
-+  ],
-+  "id": "libvirt-42"
-+}
-+
-+{
-+  "execute": "query-tpm-models",
-+  "id": "libvirt-43"
-+}
-+
-+{
-+  "return": [
-+    "tpm-crb",
-+    "tpm-tis"
-+  ],
-+  "id": "libvirt-43"
-+}
-+
-+{
-+  "execute": "query-tpm-types",
-+  "id": "libvirt-44"
-+}
-+
-+{
-+  "return": [
-+    "passthrough",
-+    "emulator"
-+  ],
-+  "id": "libvirt-44"
-+}
-+
-+{
-+  "execute": "query-command-line-options",
-+  "id": "libvirt-45"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "parameters": [
-+        {
-+          "name": "type",
-+          "help": "machine type",
-+          "type": "string"
-+        },
-+        {
-+          "name": "auto-shutdown",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "vfio-user",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "ioapic2",
-+          "help": "Enable second IO-APIC",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "auto-kernel-cmdline",
-+          "help": "Set off to disable adding virtio-mmio devices to the kernel cmdline",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "rtc",
-+          "help": "Enable MC146818 RTC",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "pcie",
-+          "help": "Enable PCIe",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "x-option-roms",
-+          "help": "Set off to disable loading option ROMs",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "isa-serial",
-+          "help": "Set off to disable the instantiation an ISA serial port",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "x-south-bridge",
-+          "help": "Use a different south bridge than PIIX3",
-+          "type": "string"
-+        },
-+        {
-+          "name": "kernel",
-+          "help": "Linux kernel image file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "dt-compatible",
-+          "help": "Overrides the \"compatible\" property of the dt root node",
-+          "type": "string"
-+        },
-+        {
-+          "name": "boot",
-+          "help": "Boot configuration",
-+          "type": "string"
-+        },
-+        {
-+          "name": "memory",
-+          "help": "Memory size configuration",
-+          "type": "string"
-+        },
-+        {
-+          "name": "initrd",
-+          "help": "Linux initial ramdisk file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "confidential-guest-support",
-+          "help": "Set confidential guest scheme to support",
-+          "type": "string"
-+        },
-+        {
-+          "name": "aux-ram-share",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "graphics",
-+          "help": "Set on/off to enable/disable graphics emulation",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "usb",
-+          "help": "Set on/off to enable/disable usb",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "firmware",
-+          "help": "Firmware image",
-+          "type": "string"
-+        },
-+        {
-+          "name": "memory-encryption",
-+          "help": "Set memory encryption object to use",
-+          "type": "string"
-+        },
-+        {
-+          "name": "dump-guest-core",
-+          "help": "Include guest memory in a core dump",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "smp",
-+          "help": "CPU topology",
-+          "type": "string"
-+        },
-+        {
-+          "name": "shim",
-+          "help": "shim.efi file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "smp-cache",
-+          "help": "Cache properties list for SMP machine",
-+          "type": "string"
-+        },
-+        {
-+          "name": "dumpdtb",
-+          "help": "Dump current dtb to a file and quit",
-+          "type": "string"
-+        },
-+        {
-+          "name": "phandle-start",
-+          "help": "The first phandle ID we may generate dynamically",
-+          "type": "number"
-+        },
-+        {
-+          "name": "memory-backend",
-+          "help": "Set RAM backendValid value is ID of hostmem based backend",
-+          "type": "string"
-+        },
-+        {
-+          "name": "mem-merge",
-+          "help": "Enable/disable memory merge support",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "dtb",
-+          "help": "Linux kernel device tree file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "append",
-+          "help": "Linux kernel command line",
-+          "type": "string"
-+        },
-+        {
-+          "name": "suppress-vmdesc",
-+          "help": "Set on to disable self-describing migration",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "smm",
-+          "help": "Enable SMM",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "acpi",
-+          "help": "Enable ACPI",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "pit",
-+          "help": "Enable i8254 PIT",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "pic",
-+          "help": "Enable i8259 PIC",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "x-oem-table-id",
-+          "help": "Override the default value of field OEM Table ID in ACPI table header.The string may be up to 8 bytes in size",
-+          "type": "string"
-+        },
-+        {
-+          "name": "bus-lock-ratelimit",
-+          "help": "Set the ratelimit for the bus locks acquired in VMs",
-+          "type": "string"
-+        },
-+        {
-+          "name": "sgx-epc",
-+          "help": "SGX EPC device",
-+          "type": "string"
-+        },
-+        {
-+          "name": "x-oem-id",
-+          "help": "Override the default value of field OEMID in ACPI table header.The string may be up to 6 bytes in size",
-+          "type": "string"
-+        },
-+        {
-+          "name": "max-fw-size",
-+          "help": "Maximum combined firmware size",
-+          "type": "size"
-+        },
-+        {
-+          "name": "default-bus-bypass-iommu",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "sata",
-+          "help": "Enable/disable Serial ATA bus",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "vmport",
-+          "help": "Enable vmport (pc & q35)",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "i8042",
-+          "help": "Enable/disable Intel 8042 PS/2 controller emulation",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "hpet",
-+          "help": "Enable/disable high precision event timer emulation",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "smbios-entry-point-type",
-+          "help": "SMBIOS Entry Point type [32, 64]",
-+          "type": "string"
-+        },
-+        {
-+          "name": "max-ram-below-4g",
-+          "help": "Maximum ram below the 4G boundary (32bit boundary)",
-+          "type": "size"
-+        },
-+        {
-+          "name": "fd-bootchk",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "smbus",
-+          "help": "Enable/disable system management bus",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "machine"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "rendernode",
-+          "type": "string"
-+        },
-+        {
-+          "name": "gl",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "head",
-+          "type": "number"
-+        },
-+        {
-+          "name": "display",
-+          "type": "string"
-+        },
-+        {
-+          "name": "seamless-migration",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "playback-compression",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "agent-mouse",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "streaming-video",
-+          "type": "string"
-+        },
-+        {
-+          "name": "zlib-glz-wan-compression",
-+          "type": "string"
-+        },
-+        {
-+          "name": "jpeg-wan-compression",
-+          "type": "string"
-+        },
-+        {
-+          "name": "image-compression",
-+          "type": "string"
-+        },
-+        {
-+          "name": "plaintext-channel",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls-channel",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls-ciphers",
-+          "type": "string"
-+        },
-+        {
-+          "name": "x509-dh-key-file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "x509-cacert-file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "x509-cert-file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "x509-key-password",
-+          "type": "string"
-+        },
-+        {
-+          "name": "x509-key-file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "x509-dir",
-+          "type": "string"
-+        },
-+        {
-+          "name": "sasl",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "disable-agent-file-xfer",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "disable-copy-paste",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "disable-ticketing",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "password-secret",
-+          "type": "string"
-+        },
-+        {
-+          "name": "unix",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "ipv6",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "ipv4",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "addr",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls-port",
-+          "type": "number"
-+        },
-+        {
-+          "name": "port",
-+          "type": "number"
-+        }
-+      ],
-+      "option": "spice"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "timeout",
-+          "help": "Request timeout in seconds (default 0 = no timeout)",
-+          "type": "number"
-+        },
-+        {
-+          "name": "initiator-name",
-+          "help": "Initiator iqn name to use when connecting",
-+          "type": "string"
-+        },
-+        {
-+          "name": "header-digest",
-+          "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}",
-+          "type": "string"
-+        },
-+        {
-+          "name": "password-secret",
-+          "help": "ID of the secret providing password for CHAP authentication to target",
-+          "type": "string"
-+        },
-+        {
-+          "name": "password",
-+          "help": "password for CHAP authentication to target",
-+          "type": "string"
-+        },
-+        {
-+          "name": "user",
-+          "help": "username for CHAP authentication to target",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "iscsi"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "resourcecontrol",
-+          "type": "string"
-+        },
-+        {
-+          "name": "spawn",
-+          "type": "string"
-+        },
-+        {
-+          "name": "elevateprivileges",
-+          "type": "string"
-+        },
-+        {
-+          "name": "obsolete",
-+          "type": "string"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "sandbox"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "dmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "fmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "sock_fd",
-+          "type": "number"
-+        },
-+        {
-+          "name": "socket",
-+          "type": "string"
-+        },
-+        {
-+          "name": "multidevs",
-+          "type": "string"
-+        },
-+        {
-+          "name": "readonly",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "writeout",
-+          "type": "string"
-+        },
-+        {
-+          "name": "security_model",
-+          "type": "string"
-+        },
-+        {
-+          "name": "mount_tag",
-+          "type": "string"
-+        },
-+        {
-+          "name": "path",
-+          "type": "string"
-+        },
-+        {
-+          "name": "fsdriver",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "virtfs"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "throttling.iops-size",
-+          "help": "when limiting by iops max size of an I/O in bytes",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write-max-length",
-+          "help": "length of the bps-write-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read-max-length",
-+          "help": "length of the bps-read-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total-max-length",
-+          "help": "length of the bps-total-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write-max-length",
-+          "help": "length of the iops-write-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read-max-length",
-+          "help": "length of the iops-read-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total-max-length",
-+          "help": "length of the iops-total-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write-max",
-+          "help": "total bytes write burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read-max",
-+          "help": "total bytes read burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total-max",
-+          "help": "total bytes burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write-max",
-+          "help": "I/O operations write burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read-max",
-+          "help": "I/O operations read burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total-max",
-+          "help": "I/O operations burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write",
-+          "help": "limit write bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read",
-+          "help": "limit read bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total",
-+          "help": "limit total bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write",
-+          "help": "limit write operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read",
-+          "help": "limit read operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total",
-+          "help": "limit total I/O operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "dmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "fmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "sock_fd",
-+          "type": "number"
-+        },
-+        {
-+          "name": "socket",
-+          "type": "string"
-+        },
-+        {
-+          "name": "multidevs",
-+          "type": "string"
-+        },
-+        {
-+          "name": "readonly",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "writeout",
-+          "type": "string"
-+        },
-+        {
-+          "name": "security_model",
-+          "type": "string"
-+        },
-+        {
-+          "name": "path",
-+          "type": "string"
-+        },
-+        {
-+          "name": "fsdriver",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "fsdev"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "smbios"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "acpi"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "power-control",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "audiodev",
-+          "type": "string"
-+        },
-+        {
-+          "name": "non-adaptive",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "lossy",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "sasl-authz",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "type": "string"
-+        },
-+        {
-+          "name": "sasl",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "key-delay-ms",
-+          "type": "number"
-+        },
-+        {
-+          "name": "lock-key-sync",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "reverse",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "password-secret",
-+          "type": "string"
-+        },
-+        {
-+          "name": "password",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "ipv6",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "ipv4",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "to",
-+          "type": "number"
-+        },
-+        {
-+          "name": "connections",
-+          "type": "number"
-+        },
-+        {
-+          "name": "head",
-+          "type": "number"
-+        },
-+        {
-+          "name": "display",
-+          "type": "string"
-+        },
-+        {
-+          "name": "share",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "type": "string"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "string"
-+        },
-+        {
-+          "name": "vnc",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "vnc"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "user",
-+          "type": "string"
-+        },
-+        {
-+          "name": "chroot",
-+          "type": "string"
-+        },
-+        {
-+          "name": "async-teardown",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "run-with"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "watchdog",
-+          "type": "string"
-+        },
-+        {
-+          "name": "panic",
-+          "type": "string"
-+        },
-+        {
-+          "name": "reboot",
-+          "type": "string"
-+        },
-+        {
-+          "name": "shutdown",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "action"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "gen_id",
-+          "help": "Sets id of the object generating the fw_cfg blob to be inserted",
-+          "type": "string"
-+        },
-+        {
-+          "name": "string",
-+          "help": "Sets content of the blob to be inserted from a string",
-+          "type": "string"
-+        },
-+        {
-+          "name": "file",
-+          "help": "Sets the name of the file from which the fw_cfg blob will be loaded",
-+          "type": "string"
-+        },
-+        {
-+          "name": "name",
-+          "help": "Sets the fw_cfg name of the blob to be inserted",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "fw_cfg"
-+    },
-+    {
-+      "parameters": [],
-+      "option": ""
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "rrsnapshot",
-+          "type": "string"
-+        },
-+        {
-+          "name": "rrfile",
-+          "type": "string"
-+        },
-+        {
-+          "name": "rr",
-+          "type": "string"
-+        },
-+        {
-+          "name": "sleep",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "align",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "shift",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "icount"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "numa"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "debug-threads",
-+          "help": "When enabled, name the individual threads; defaults off.\nNOTE: The thread names are for debugging and not a\nstable API.",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "process",
-+          "help": "Sets the name of the QEMU process, as shown in top etc",
-+          "type": "string"
-+        },
-+        {
-+          "name": "guest",
-+          "help": "Sets the name of the guest.\nThis name will be displayed in the SDL window caption.\nThe name will also be used for the VNC server",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "name"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "guest-name",
-+          "help": "Prepends guest name for error messages but only if -name guest is set otherwise option is ignored\n",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "timestamp",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "msg"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "cpu-pm",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "mem-lock",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "overcommit"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "tpmdev"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "object"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "opaque",
-+          "help": "free-form string used to describe fd",
-+          "type": "string"
-+        },
-+        {
-+          "name": "set",
-+          "help": "ID of the fd set to add fd to",
-+          "type": "number"
-+        },
-+        {
-+          "name": "fd",
-+          "help": "file descriptor of which a duplicate is added to fd set",
-+          "type": "number"
-+        }
-+      ],
-+      "option": "add-fd"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "strict",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "reboot-timeout",
-+          "type": "number"
-+        },
-+        {
-+          "name": "splash-time",
-+          "type": "number"
-+        },
-+        {
-+          "name": "splash",
-+          "type": "string"
-+        },
-+        {
-+          "name": "menu",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "once",
-+          "type": "string"
-+        },
-+        {
-+          "name": "order",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "boot-opts"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "maxcpus",
-+          "type": "number"
-+        },
-+        {
-+          "name": "threads",
-+          "type": "number"
-+        },
-+        {
-+          "name": "cores",
-+          "type": "number"
-+        },
-+        {
-+          "name": "modules",
-+          "type": "number"
-+        },
-+        {
-+          "name": "clusters",
-+          "type": "number"
-+        },
-+        {
-+          "name": "dies",
-+          "type": "number"
-+        },
-+        {
-+          "name": "sockets",
-+          "type": "number"
-+        },
-+        {
-+          "name": "books",
-+          "type": "number"
-+        },
-+        {
-+          "name": "drawers",
-+          "type": "number"
-+        },
-+        {
-+          "name": "cpus",
-+          "type": "number"
-+        }
-+      ],
-+      "option": "smp-opts"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "maxmem",
-+          "type": "size"
-+        },
-+        {
-+          "name": "slots",
-+          "type": "number"
-+        },
-+        {
-+          "name": "size",
-+          "type": "size"
-+        }
-+      ],
-+      "option": "memory"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "accel"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "romfile",
-+          "type": "string"
-+        },
-+        {
-+          "name": "bootindex",
-+          "type": "number"
-+        }
-+      ],
-+      "option": "option-rom"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "plugin"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "events",
-+          "type": "string"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "trace"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "pretty",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "string"
-+        },
-+        {
-+          "name": "mode",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "mon"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "value",
-+          "type": "string"
-+        },
-+        {
-+          "name": "property",
-+          "type": "string"
-+        },
-+        {
-+          "name": "driver",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "global"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "driftfix",
-+          "type": "string"
-+        },
-+        {
-+          "name": "clock",
-+          "type": "string"
-+        },
-+        {
-+          "name": "base",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "rtc"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "net"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "nic"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "netdev"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "device"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "abstract",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "tight",
-+          "default": "on",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "clipboard",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "mouse",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "logappend",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "logfile",
-+          "type": "string"
-+        },
-+        {
-+          "name": "append",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "chardevs.3",
-+          "type": "string"
-+        },
-+        {
-+          "name": "chardevs.2",
-+          "type": "string"
-+        },
-+        {
-+          "name": "chardevs.1",
-+          "type": "string"
-+        },
-+        {
-+          "name": "chardevs.0",
-+          "type": "string"
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "string"
-+        },
-+        {
-+          "name": "size",
-+          "type": "size"
-+        },
-+        {
-+          "name": "debug",
-+          "type": "number"
-+        },
-+        {
-+          "name": "name",
-+          "type": "string"
-+        },
-+        {
-+          "name": "signal",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "mux",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "rows",
-+          "type": "number"
-+        },
-+        {
-+          "name": "cols",
-+          "type": "number"
-+        },
-+        {
-+          "name": "height",
-+          "type": "number"
-+        },
-+        {
-+          "name": "width",
-+          "type": "number"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tn3270",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "telnet",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "reconnect-ms",
-+          "type": "number"
-+        },
-+        {
-+          "name": "reconnect",
-+          "type": "number"
-+        },
-+        {
-+          "name": "nodelay",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "delay",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "server",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "wait",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "ipv6",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "ipv4",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "to",
-+          "type": "number"
-+        },
-+        {
-+          "name": "localport",
-+          "type": "string"
-+        },
-+        {
-+          "name": "localaddr",
-+          "type": "string"
-+        },
-+        {
-+          "name": "fd",
-+          "type": "string"
-+        },
-+        {
-+          "name": "port",
-+          "type": "string"
-+        },
-+        {
-+          "name": "host",
-+          "type": "string"
-+        },
-+        {
-+          "name": "input-path",
-+          "type": "string"
-+        },
-+        {
-+          "name": "path",
-+          "type": "string"
-+        },
-+        {
-+          "name": "backend",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "chardev"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "copy-on-read",
-+          "help": "copy read data from backing file into image file",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "werror",
-+          "help": "write error action",
-+          "type": "string"
-+        },
-+        {
-+          "name": "rerror",
-+          "help": "read error action",
-+          "type": "string"
-+        },
-+        {
-+          "name": "read-only",
-+          "help": "open drive file as read-only",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "file",
-+          "help": "file name",
-+          "type": "string"
-+        },
-+        {
-+          "name": "if",
-+          "help": "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "media",
-+          "help": "media type (disk, cdrom)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "index",
-+          "help": "index number",
-+          "type": "number"
-+        },
-+        {
-+          "name": "unit",
-+          "help": "unit number (i.e. lun for scsi)",
-+          "type": "number"
-+        },
-+        {
-+          "name": "bus",
-+          "help": "bus number",
-+          "type": "number"
-+        },
-+        {
-+          "name": "stats-account-failed",
-+          "help": "whether to account for failed I/O operations in the statistics",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "stats-account-invalid",
-+          "help": "whether to account for invalid I/O operations in the statistics",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "detect-zeroes",
-+          "help": "try to optimize zero writes (off, on, unmap)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "throttling.group",
-+          "help": "name of the block throttling group",
-+          "type": "string"
-+        },
-+        {
-+          "name": "throttling.iops-size",
-+          "help": "when limiting by iops max size of an I/O in bytes",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write-max-length",
-+          "help": "length of the bps-write-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read-max-length",
-+          "help": "length of the bps-read-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total-max-length",
-+          "help": "length of the bps-total-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write-max-length",
-+          "help": "length of the iops-write-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read-max-length",
-+          "help": "length of the iops-read-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total-max-length",
-+          "help": "length of the iops-total-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write-max",
-+          "help": "total bytes write burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read-max",
-+          "help": "total bytes read burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total-max",
-+          "help": "total bytes burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write-max",
-+          "help": "I/O operations write burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read-max",
-+          "help": "I/O operations read burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total-max",
-+          "help": "I/O operations burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write",
-+          "help": "limit write bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read",
-+          "help": "limit read bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total",
-+          "help": "limit total bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write",
-+          "help": "limit write operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read",
-+          "help": "limit read operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total",
-+          "help": "limit total I/O operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "werror",
-+          "help": "write error action",
-+          "type": "string"
-+        },
-+        {
-+          "name": "format",
-+          "help": "disk format (raw, qcow2, ...)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "cache.writeback",
-+          "help": "Enable writeback mode",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "aio",
-+          "help": "host AIO implementation (threads, native, io_uring)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "snapshot",
-+          "help": "enable/disable snapshot mode",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "force-share",
-+          "help": "always accept other writers (default: off)",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "discard",
-+          "help": "discard operation (ignore/off, unmap/on)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "auto-read-only",
-+          "help": "Node can become read-only if opening read-write fails",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "cache.no-flush",
-+          "help": "Ignore flush requests",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "cache.direct",
-+          "help": "Bypass software writeback cache on the host",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "driver",
-+          "help": "Block driver to use for the node",
-+          "type": "string"
-+        },
-+        {
-+          "name": "node-name",
-+          "help": "Node name of the block device node",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "drive"
-+    }
-+  ],
-+  "id": "libvirt-45"
-+}
-+
-+{
-+  "execute": "query-migrate-capabilities",
-+  "id": "libvirt-46"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "state": false,
-+      "capability": "xbzrle"
-+    },
-+    {
-+      "state": false,
-+      "capability": "rdma-pin-all"
-+    },
-+    {
-+      "state": false,
-+      "capability": "auto-converge"
-+    },
-+    {
-+      "state": false,
-+      "capability": "zero-blocks"
-+    },
-+    {
-+      "state": false,
-+      "capability": "events"
-+    },
-+    {
-+      "state": false,
-+      "capability": "postcopy-ram"
-+    },
-+    {
-+      "state": false,
-+      "capability": "x-colo"
-+    },
-+    {
-+      "state": false,
-+      "capability": "release-ram"
-+    },
-+    {
-+      "state": false,
-+      "capability": "return-path"
-+    },
-+    {
-+      "state": false,
-+      "capability": "pause-before-switchover"
-+    },
-+    {
-+      "state": false,
-+      "capability": "multifd"
-+    },
-+    {
-+      "state": false,
-+      "capability": "dirty-bitmaps"
-+    },
-+    {
-+      "state": false,
-+      "capability": "postcopy-blocktime"
-+    },
-+    {
-+      "state": false,
-+      "capability": "late-block-activate"
-+    },
-+    {
-+      "state": false,
-+      "capability": "x-ignore-shared"
-+    },
-+    {
-+      "state": false,
-+      "capability": "validate-uuid"
-+    },
-+    {
-+      "state": false,
-+      "capability": "background-snapshot"
-+    },
-+    {
-+      "state": false,
-+      "capability": "zero-copy-send"
-+    },
-+    {
-+      "state": false,
-+      "capability": "postcopy-preempt"
-+    },
-+    {
-+      "state": false,
-+      "capability": "switchover-ack"
-+    },
-+    {
-+      "state": false,
-+      "capability": "dirty-limit"
-+    },
-+    {
-+      "state": false,
-+      "capability": "mapped-ram"
-+    }
-+  ],
-+  "id": "libvirt-46"
-+}
-+
-+{
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-47"
-+}
-+
-+{
-+  "id": "libvirt-47",
-+  "error": {
-+    "class": "GenericError",
-+    "desc": "SEV: Failed to open /dev/sev: No such file or directory"
-+  }
-+}
-+
-+{
-+  "execute": "query-sgx-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "id": "libvirt-48",
-+  "error": {
-+    "class": "GenericError",
-+    "desc": "Could not open '/dev/sgx_vepc': No such file or directory"
-+  }
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "host"
-+    }
-+  },
-+  "id": "libvirt-49"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "avx-ne-convert": false,
-+        "vmx-entry-load-rtit-ctl": false,
-+        "svme-addr-chk": true,
-+        "lfence-always-serializing": true,
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "vmx-apicv-xapic": false,
-+        "mmx": true,
-+        "rdpid": true,
-+        "arat": true,
-+        "vmx-page-walk-4": false,
-+        "vmx-page-walk-5": false,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "vmx-desc-exit": false,
-+        "pause-filter": true,
-+        "mcdt-no": false,
-+        "bus-lock-detect": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "vmx-tsc-scaling": false,
-+        "prefetchiti": false,
-+        "vmx-cr8-store-exit": false,
-+        "vmx-rdseed-exit": false,
-+        "amx-fp16": false,
-+        "fred": false,
-+        "vmx-eptp-switching": false,
-+        "ddpd-u": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": true,
-+        "mpx": false,
-+        "auto-ibrs": false,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "vmx-exit-load-efer": false,
-+        "vmx-exit-clear-bndcfgs": false,
-+        "vmx-nested-exception": false,
-+        "sse4.1": true,
-+        "family": 23,
-+        "intel-pt-lip": false,
-+        "vmx-vmwrite-vmexit-fields": false,
-+        "kvm-asyncpf-int": true,
-+        "vmx-vnmi": false,
-+        "vmx-true-ctls": false,
-+        "vmx-ept-execonly": false,
-+        "vmx-exit-save-efer": false,
-+        "vmx-invept-all-context": false,
-+        "wbnoinvd": true,
-+        "avx512f": false,
-+        "rfds-no": true,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "sgx": false,
-+        "srso-user-kernel-no": false,
-+        "vmx-exit-load-pat": false,
-+        "vmx-intr-exit": false,
-+        "min-level": 16,
-+        "vmx-flexpriority": false,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "sgx-exinfo": false,
-+        "intel-psfd": false,
-+        "amd-psfd": false,
-+        "gds-no": true,
-+        "ds": false,
-+        "fxsr": true,
-+        "avx512-fp16": false,
-+        "avx512-bf16": false,
-+        "vmx-cr8-load-exit": false,
-+        "xsaveopt": true,
-+        "arch-lbr": false,
-+        "vmx-apicv-vid": false,
-+        "vmx-exit-save-pat": false,
-+        "xtpr": false,
-+        "tsx-ctrl": false,
-+        "vmx-ple": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "vmx-vmfunc": false,
-+        "vmx-activity-shutdown": false,
-+        "sgx1": false,
-+        "sgx2": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "vmx-encls-exit": false,
-+        "null-sel-clr-base": true,
-+        "stibp": true,
-+        "vmx-msr-bitmap": false,
-+        "xcrypt-en": false,
-+        "vmx-mwait-exit": false,
-+        "vmx-pml": false,
-+        "vmx-nmi-exit": false,
-+        "amx-tile": false,
-+        "vmx-invept-single-context-noglobals": false,
-+        "pn": false,
-+        "rsba": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "vmx-unrestricted-guest": false,
-+        "vmx-cr3-store-noexit": false,
-+        "pku": false,
-+        "pks": false,
-+        "smx": false,
-+        "sm3": false,
-+        "sm4": false,
-+        "cmp-legacy": true,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": true,
-+        "hle": false,
-+        "avx-vnni": false,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "npt": true,
-+        "sgxlc": false,
-+        "perfmon-v2": false,
-+        "rdctl-no": true,
-+        "vmx-invvpid": false,
-+        "clwb": true,
-+        "avx10-128": false,
-+        "lbrv": true,
-+        "adx": true,
-+        "ss": false,
-+        "pni": true,
-+        "tsx-ldtrk": false,
-+        "ibpb-brtype": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": true,
-+        "vmx-invpcid-exit": false,
-+        "amx-int8": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "sgx-edeccssa": false,
-+        "vmx-apicv-x2apic": false,
-+        "kvm-pv-sched-yield": true,
-+        "vmx-invlpg-exit": false,
-+        "no-nested-data-bp": false,
-+        "vmx-invvpid-all-context": false,
-+        "vmx-activity-hlt": false,
-+        "flushbyasid": true,
-+        "f16c": true,
-+        "fdp-excptn-only": false,
-+        "vmx-exit-ack-intr": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "vmx-tsc-offset": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "fbsdp-no": false,
-+        "kvmclock-stable-bit": true,
-+        "vmx-rdtsc-exit": false,
-+        "hypervisor": true,
-+        "vmx-rdtscp-exit": false,
-+        "mds-no": true,
-+        "pcommit": false,
-+        "vmx-vpid": false,
-+        "syscall": true,
-+        "kvm-asyncpf-vmexit": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "vmx-monitor-exit": false,
-+        "sse2": true,
-+        "ssbd": true,
-+        "vmx-wbinvd-exit": false,
-+        "est": false,
-+        "kvm-poll-control": true,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "zero-fcs-fds": false,
-+        "kvm-pv-eoi": true,
-+        "kvm-pv-ipi": true,
-+        "cx8": true,
-+        "vmx-invvpid-single-addr": false,
-+        "waitpkg": false,
-+        "cldemote": false,
-+        "sgx-tokenkey": false,
-+        "vmx-ept": false,
-+        "pbrsb-no": false,
-+        "xfd": false,
-+        "lkgs": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "vmx-entry-load-bndcfgs": false,
-+        "vmx-exit-clear-rtit-ctl": false,
-+        "stibp-always-on": false,
-+        "model": 113,
-+        "movbe": true,
-+        "nrip-save": true,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "kvm-msi-ext-dest-id": false,
-+        "vmx-pause-exit": false,
-+        "invpcid": false,
-+        "sgx-debug": false,
-+        "pdpe1gb": true,
-+        "sgx-mode64": false,
-+        "tsc-deadline": true,
-+        "skip-l1dfl-vmentry": true,
-+        "vmx-exit-load-perf-global-ctrl": false,
-+        "fma": true,
-+        "lam": false,
-+        "cx16": true,
-+        "de": true,
-+        "fzrm": false,
-+        "avx-ifma": false,
-+        "stepping": 0,
-+        "xsave": true,
-+        "vmx-entry-load-fred": false,
-+        "clflush": true,
-+        "skinit": false,
-+        "srso-no": false,
-+        "avx-vnni-int8": false,
-+        "vmx-exit-secondary-ctls": false,
-+        "tsc": true,
-+        "tce": false,
-+        "flush-l1d": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "vmx-exit-nosave-debugctl": false,
-+        "sgx-kss": false,
-+        "la57": false,
-+        "vmx-invept": false,
-+        "osvw": true,
-+        "rfds-clear": false,
-+        "succor": true,
-+        "apic": true,
-+        "pmm": false,
-+        "vmx-entry-noload-debugctl": false,
-+        "vmx-eptad": false,
-+        "spec-ctrl": false,
-+        "vmx-posted-intr": false,
-+        "vmx-apicv-register": false,
-+        "tsc-adjust": true,
-+        "vnmi": false,
-+        "kvm-steal-time": true,
-+        "psdp-no": false,
-+        "vmx-any-errcode": false,
-+        "avx512-vp2intersect": false,
-+        "kvmclock": true,
-+        "vmx-zero-len-inject": false,
-+        "amx-complex": false,
-+        "avx-vnni-int16": false,
-+        "pschange-mc-no": true,
-+        "v-vmsave-vmload": true,
-+        "vmx-rdrand-exit": false,
-+        "sgx-provisionkey": false,
-+        "lwp": false,
-+        "ipred-ctrl": false,
-+        "amd-ssbd": true,
-+        "avx10-256": false,
-+        "xop": false,
-+        "ibpb": true,
-+        "ibrs": false,
-+        "avx": true,
-+        "core-capability": false,
-+        "vmx-invept-single-context": false,
-+        "movdiri": false,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "vmx-ept-2mb": false,
-+        "vmx-ept-1gb": false,
-+        "ht": false,
-+        "vmx-io-exit": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "vaes": false,
-+        "serialize": false,
-+        "movdir64b": false,
-+        "xsaves": false,
-+        "vmx-shadow-vmcs": false,
-+        "lm": true,
-+        "vmx-exit-save-preemption-timer": false,
-+        "vmx-entry-load-pat": false,
-+        "fsrm": false,
-+        "fsrs": false,
-+        "fsrc": false,
-+        "sbdr-ssdp-no": false,
-+        "vmx-entry-load-perf-global-ctrl": false,
-+        "vmx-io-bitmap": false,
-+        "umip": true,
-+        "vmx-store-lma": false,
-+        "vmx-movdr-exit": false,
-+        "pse": true,
-+        "avx2": true,
-+        "avic": false,
-+        "sep": true,
-+        "virt-ssbd": true,
-+        "vmx-cr3-load-noexit": false,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "sbpb": false,
-+        "misalignsse": true,
-+        "split-lock-detect": false,
-+        "min-xlevel": 2147483681,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": true,
-+        "topoext": false,
-+        "amd-stibp": true,
-+        "vmx-preemption-timer": false,
-+        "clflushopt": true,
-+        "vmx-entry-load-pkrs": false,
-+        "avx10-512": false,
-+        "vmx-vnmi-pending": false,
-+        "monitor": false,
-+        "vmx-vintr-pending": false,
-+        "avx512er": false,
-+        "full-width-write": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "taa-no": false,
-+        "avx10": false,
-+        "arch-capabilities": true,
-+        "vgif": true,
-+        "vmx-secondary-ctls": false,
-+        "vmx-xsaves": false,
-+        "clzero": true,
-+        "3dnow": false,
-+        "erms": false,
-+        "vmx-entry-ia32e-mode": false,
-+        "lahf-lm": true,
-+        "overflow-recov": true,
-+        "vpclmulqdq": false,
-+        "vmx-ins-outs": false,
-+        "fxsr-opt": true,
-+        "xstore": false,
-+        "rtm": false,
-+        "kvm-hint-dedicated": false,
-+        "sgx-aex-notify": false,
-+        "bhi-ctrl": false,
-+        "amx-bf16": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "cmpccxadd": false,
-+        "bhi-no": false,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "xsaveerptr": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "vmx-activity-wait-sipi": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "vmx-rdpmc-exit": false,
-+        "vmx-mtf": false,
-+        "vmx-entry-load-efer": false,
-+        "eraps": false,
-+        "wrmsrns": false,
-+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
-+        "sha-ni": true,
-+        "rrsba-ctrl": false,
-+        "fb-clear": false,
-+        "vmx-exit-load-pkrs": false,
-+        "abm": true,
-+        "sha512": false,
-+        "vmx-ept-advanced-exitinfo": false,
-+        "vmx-enable-user-wait-pause": false,
-+        "avx512pf": false,
-+        "vmx-hlt-exit": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-49"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "host",
-+      "props": {
-+        "migratable": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-50"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "avx-ne-convert": false,
-+        "vmx-entry-load-rtit-ctl": false,
-+        "svme-addr-chk": true,
-+        "lfence-always-serializing": true,
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "vmx-apicv-xapic": false,
-+        "mmx": true,
-+        "rdpid": true,
-+        "arat": true,
-+        "vmx-page-walk-4": false,
-+        "vmx-page-walk-5": false,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "vmx-desc-exit": false,
-+        "pause-filter": true,
-+        "mcdt-no": false,
-+        "bus-lock-detect": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "vmx-tsc-scaling": false,
-+        "prefetchiti": false,
-+        "vmx-cr8-store-exit": false,
-+        "vmx-rdseed-exit": false,
-+        "amx-fp16": false,
-+        "fred": false,
-+        "vmx-eptp-switching": false,
-+        "ddpd-u": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": true,
-+        "mpx": false,
-+        "auto-ibrs": false,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "vmx-exit-load-efer": false,
-+        "vmx-exit-clear-bndcfgs": false,
-+        "vmx-nested-exception": false,
-+        "sse4.1": true,
-+        "family": 23,
-+        "intel-pt-lip": false,
-+        "vmx-vmwrite-vmexit-fields": false,
-+        "kvm-asyncpf-int": true,
-+        "vmx-vnmi": false,
-+        "vmx-true-ctls": false,
-+        "vmx-ept-execonly": false,
-+        "vmx-exit-save-efer": false,
-+        "vmx-invept-all-context": false,
-+        "wbnoinvd": true,
-+        "avx512f": false,
-+        "rfds-no": true,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "sgx": false,
-+        "srso-user-kernel-no": false,
-+        "vmx-exit-load-pat": false,
-+        "vmx-intr-exit": false,
-+        "min-level": 16,
-+        "vmx-flexpriority": false,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "sgx-exinfo": false,
-+        "intel-psfd": false,
-+        "amd-psfd": false,
-+        "gds-no": true,
-+        "ds": false,
-+        "fxsr": true,
-+        "avx512-fp16": false,
-+        "avx512-bf16": false,
-+        "vmx-cr8-load-exit": false,
-+        "xsaveopt": true,
-+        "arch-lbr": false,
-+        "vmx-apicv-vid": false,
-+        "vmx-exit-save-pat": false,
-+        "xtpr": false,
-+        "tsx-ctrl": false,
-+        "vmx-ple": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "vmx-vmfunc": false,
-+        "vmx-activity-shutdown": false,
-+        "sgx1": false,
-+        "sgx2": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "vmx-encls-exit": false,
-+        "null-sel-clr-base": true,
-+        "stibp": true,
-+        "vmx-msr-bitmap": false,
-+        "xcrypt-en": false,
-+        "vmx-mwait-exit": false,
-+        "vmx-pml": false,
-+        "vmx-nmi-exit": false,
-+        "amx-tile": false,
-+        "vmx-invept-single-context-noglobals": false,
-+        "pn": false,
-+        "rsba": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "vmx-unrestricted-guest": false,
-+        "vmx-cr3-store-noexit": false,
-+        "pku": false,
-+        "pks": false,
-+        "smx": false,
-+        "sm3": false,
-+        "sm4": false,
-+        "cmp-legacy": true,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": true,
-+        "hle": false,
-+        "avx-vnni": false,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "npt": true,
-+        "sgxlc": false,
-+        "perfmon-v2": false,
-+        "rdctl-no": true,
-+        "vmx-invvpid": false,
-+        "clwb": true,
-+        "avx10-128": false,
-+        "lbrv": true,
-+        "adx": true,
-+        "ss": false,
-+        "pni": true,
-+        "tsx-ldtrk": false,
-+        "ibpb-brtype": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": true,
-+        "vmx-invpcid-exit": false,
-+        "amx-int8": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "sgx-edeccssa": false,
-+        "vmx-apicv-x2apic": false,
-+        "kvm-pv-sched-yield": true,
-+        "vmx-invlpg-exit": false,
-+        "no-nested-data-bp": false,
-+        "vmx-invvpid-all-context": false,
-+        "vmx-activity-hlt": false,
-+        "flushbyasid": true,
-+        "f16c": true,
-+        "fdp-excptn-only": false,
-+        "vmx-exit-ack-intr": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "vmx-tsc-offset": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "fbsdp-no": false,
-+        "kvmclock-stable-bit": true,
-+        "vmx-rdtsc-exit": false,
-+        "hypervisor": true,
-+        "vmx-rdtscp-exit": false,
-+        "mds-no": true,
-+        "pcommit": false,
-+        "vmx-vpid": false,
-+        "syscall": true,
-+        "kvm-asyncpf-vmexit": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": true,
-+        "vmx-monitor-exit": false,
-+        "sse2": true,
-+        "ssbd": true,
-+        "vmx-wbinvd-exit": false,
-+        "est": false,
-+        "kvm-poll-control": true,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "zero-fcs-fds": false,
-+        "kvm-pv-eoi": true,
-+        "kvm-pv-ipi": true,
-+        "cx8": true,
-+        "vmx-invvpid-single-addr": false,
-+        "waitpkg": false,
-+        "cldemote": false,
-+        "sgx-tokenkey": false,
-+        "vmx-ept": false,
-+        "pbrsb-no": false,
-+        "xfd": false,
-+        "lkgs": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "vmx-entry-load-bndcfgs": false,
-+        "vmx-exit-clear-rtit-ctl": false,
-+        "stibp-always-on": false,
-+        "model": 113,
-+        "movbe": true,
-+        "nrip-save": true,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "kvm-msi-ext-dest-id": false,
-+        "vmx-pause-exit": false,
-+        "invpcid": false,
-+        "sgx-debug": false,
-+        "pdpe1gb": true,
-+        "sgx-mode64": false,
-+        "tsc-deadline": true,
-+        "skip-l1dfl-vmentry": true,
-+        "vmx-exit-load-perf-global-ctrl": false,
-+        "fma": true,
-+        "lam": false,
-+        "cx16": true,
-+        "de": true,
-+        "fzrm": false,
-+        "avx-ifma": false,
-+        "stepping": 0,
-+        "xsave": true,
-+        "vmx-entry-load-fred": false,
-+        "clflush": true,
-+        "skinit": false,
-+        "srso-no": false,
-+        "avx-vnni-int8": false,
-+        "vmx-exit-secondary-ctls": false,
-+        "tsc": true,
-+        "tce": false,
-+        "flush-l1d": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "vmx-exit-nosave-debugctl": false,
-+        "sgx-kss": false,
-+        "la57": false,
-+        "vmx-invept": false,
-+        "osvw": true,
-+        "rfds-clear": false,
-+        "succor": true,
-+        "apic": true,
-+        "pmm": false,
-+        "vmx-entry-noload-debugctl": false,
-+        "vmx-eptad": false,
-+        "spec-ctrl": false,
-+        "vmx-posted-intr": false,
-+        "vmx-apicv-register": false,
-+        "tsc-adjust": true,
-+        "vnmi": false,
-+        "kvm-steal-time": true,
-+        "psdp-no": false,
-+        "vmx-any-errcode": false,
-+        "avx512-vp2intersect": false,
-+        "kvmclock": true,
-+        "vmx-zero-len-inject": false,
-+        "amx-complex": false,
-+        "avx-vnni-int16": false,
-+        "pschange-mc-no": true,
-+        "v-vmsave-vmload": true,
-+        "vmx-rdrand-exit": false,
-+        "sgx-provisionkey": false,
-+        "lwp": false,
-+        "ipred-ctrl": false,
-+        "amd-ssbd": true,
-+        "avx10-256": false,
-+        "xop": false,
-+        "ibpb": true,
-+        "ibrs": false,
-+        "avx": true,
-+        "core-capability": false,
-+        "vmx-invept-single-context": false,
-+        "movdiri": false,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "vmx-ept-2mb": false,
-+        "vmx-ept-1gb": false,
-+        "ht": false,
-+        "vmx-io-exit": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "vaes": false,
-+        "serialize": false,
-+        "movdir64b": false,
-+        "xsaves": false,
-+        "vmx-shadow-vmcs": false,
-+        "lm": true,
-+        "vmx-exit-save-preemption-timer": false,
-+        "vmx-entry-load-pat": false,
-+        "fsrm": false,
-+        "fsrs": false,
-+        "fsrc": false,
-+        "sbdr-ssdp-no": false,
-+        "vmx-entry-load-perf-global-ctrl": false,
-+        "vmx-io-bitmap": false,
-+        "umip": true,
-+        "vmx-store-lma": false,
-+        "vmx-movdr-exit": false,
-+        "pse": true,
-+        "avx2": true,
-+        "avic": false,
-+        "sep": true,
-+        "virt-ssbd": true,
-+        "vmx-cr3-load-noexit": false,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "sbpb": false,
-+        "misalignsse": true,
-+        "split-lock-detect": false,
-+        "min-xlevel": 2147483681,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": true,
-+        "topoext": false,
-+        "amd-stibp": true,
-+        "vmx-preemption-timer": false,
-+        "clflushopt": true,
-+        "vmx-entry-load-pkrs": false,
-+        "avx10-512": false,
-+        "vmx-vnmi-pending": false,
-+        "monitor": false,
-+        "vmx-vintr-pending": false,
-+        "avx512er": false,
-+        "full-width-write": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "taa-no": false,
-+        "avx10": false,
-+        "arch-capabilities": true,
-+        "vgif": true,
-+        "vmx-secondary-ctls": false,
-+        "vmx-xsaves": false,
-+        "clzero": true,
-+        "3dnow": false,
-+        "erms": false,
-+        "vmx-entry-ia32e-mode": false,
-+        "lahf-lm": true,
-+        "overflow-recov": true,
-+        "vpclmulqdq": false,
-+        "vmx-ins-outs": false,
-+        "fxsr-opt": true,
-+        "xstore": false,
-+        "rtm": false,
-+        "kvm-hint-dedicated": false,
-+        "sgx-aex-notify": false,
-+        "bhi-ctrl": false,
-+        "amx-bf16": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "cmpccxadd": false,
-+        "bhi-no": false,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "xsaveerptr": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "vmx-activity-wait-sipi": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "vmx-rdpmc-exit": false,
-+        "vmx-mtf": false,
-+        "vmx-entry-load-efer": false,
-+        "eraps": false,
-+        "wrmsrns": false,
-+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
-+        "sha-ni": true,
-+        "rrsba-ctrl": false,
-+        "fb-clear": false,
-+        "vmx-exit-load-pkrs": false,
-+        "abm": true,
-+        "sha512": false,
-+        "vmx-ept-advanced-exitinfo": false,
-+        "vmx-enable-user-wait-pause": false,
-+        "avx512pf": false,
-+        "vmx-hlt-exit": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-50"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "host",
-+      "props": {
-+        "migratable": false,
-+        "hv-passthrough": true
-+      }
-+    }
-+  },
-+  "id": "libvirt-51"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "host",
-+      "props": {
-+        "avx-ne-convert": false,
-+        "vmx-entry-load-rtit-ctl": false,
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "svme-addr-chk": true,
-+        "xlevel": 2147483681,
-+        "lfence-always-serializing": true,
-+        "cmov": true,
-+        "ia64": false,
-+        "hv-version-id-minor": 0,
-+        "ssb-no": false,
-+        "aes": true,
-+        "vmx-apicv-xapic": false,
-+        "kvm-pv-enforce-cpuid": false,
-+        "mmx": true,
-+        "arat": true,
-+        "rdpid": true,
-+        "vmx-page-walk-4": false,
-+        "vmx-page-walk-5": false,
-+        "vmx-desc-exit": false,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "pause-filter": true,
-+        "mcdt-no": false,
-+        "bus-lock-detect": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "vmx-tsc-scaling": false,
-+        "prefetchiti": false,
-+        "vmx-cr8-store-exit": false,
-+        "hv-xmm-input": true,
-+        "hv-frequencies": true,
-+        "tsc-frequency": 0,
-+        "vmx-rdseed-exit": false,
-+        "guest-phys-bits": 4294967295,
-+        "xd": true,
-+        "x-intel-pt-auto-level": true,
-+        "amx-fp16": false,
-+        "hv-vendor-id": "Linux KVM Hv",
-+        "fred": false,
-+        "ddpd-u": false,
-+        "vmx-eptp-switching": false,
-+        "hv-syndbg": false,
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr-core": true,
-+        "perfctr_core": true,
-+        "auto-ibrs": false,
-+        "mpx": false,
-+        "avx512cd": false,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "vmx-nested-exception": false,
-+        "vmx-exit-load-efer": false,
-+        "vmx-exit-clear-bndcfgs": false,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "sse4_1": true,
-+        "family": 23,
-+        "legacy-cache": true,
-+        "intel-pt-lip": false,
-+        "vmx-vmwrite-vmexit-fields": false,
-+        "x-amd-topoext-features-only": true,
-+        "vmx-vnmi": false,
-+        "kvm-asyncpf-int": true,
-+        "vmx-true-ctls": false,
-+        "host-phys-bits-limit": 0,
-+        "vmx-ept-execonly": false,
-+        "vmx-exit-save-efer": false,
-+        "vmx-invept-all-context": false,
-+        "vmware-cpuid-freq": true,
-+        "wbnoinvd": true,
-+        "avx512f": false,
-+        "rfds-no": true,
-+        "xcrypt": false,
-+        "hv-runtime": true,
-+        "hv-stimer-direct": true,
-+        "mce": true,
-+        "mca": true,
-+        "msr": true,
-+        "sgx": false,
-+        "thread-id": -1,
-+        "srso-user-kernel-no": false,
-+        "vmx-exit-load-pat": false,
-+        "vmx-intr-exit": false,
-+        "min-level": 16,
-+        "vmx-flexpriority": false,
-+        "legacy-multi-node": false,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": true,
-+        "intel-psfd": false,
-+        "sgx-exinfo": false,
-+        "amd-psfd": false,
-+        "gds-no": true,
-+        "avx512-bf16": false,
-+        "avx512-fp16": false,
-+        "ds": false,
-+        "hv-crash": true,
-+        "fxsr": true,
-+        "vmx-cr8-load-exit": false,
-+        "hv-version-id-sbranch": 0,
-+        "hv-version-id-snumber": 0,
-+        "xsaveopt": true,
-+        "arch-lbr": false,
-+        "vmx-apicv-vid": false,
-+        "vmx-exit-save-pat": false,
-+        "tsx-ctrl": false,
-+        "xtpr": false,
-+        "vmx-ple": false,
-+        "hv-evmcs": false,
-+        "avx512-vpopcntdq": false,
-+        "hv-version-id-spack": 0,
-+        "phe": false,
-+        "avx512vl": false,
-+        "extapic": false,
-+        "vmx-vmfunc": false,
-+        "3dnowprefetch": true,
-+        "vmx-activity-shutdown": false,
-+        "sgx1": false,
-+        "sgx2": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "vmx-encls-exit": false,
-+        "null-sel-clr-base": true,
-+        "stibp": true,
-+        "vmx-msr-bitmap": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "vmx-mwait-exit": false,
-+        "kvm_pv_eoi": true,
-+        "vmx-pml": false,
-+        "apic-id": 4294967295,
-+        "vmx-nmi-exit": false,
-+        "vmx-invept-single-context-noglobals": false,
-+        "amx-tile": false,
-+        "pn": false,
-+        "rsba": false,
-+        "dca": false,
-+        "vmx-unrestricted-guest": false,
-+        "vendor": "AuthenticAMD",
-+        "hv-ipi": true,
-+        "vmx-cr3-store-noexit": false,
-+        "pku": false,
-+        "pks": false,
-+        "sm4": false,
-+        "sm3": false,
-+        "smx": false,
-+        "cmp-legacy": true,
-+        "cmp_legacy": true,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": true,
-+        "vmcb_clean": true,
-+        "hle": false,
-+        "amd-no-ssb": false,
-+        "3dnowext": false,
-+        "avx-vnni": false,
-+        "npt": true,
-+        "sgxlc": false,
-+        "perfmon-v2": false,
-+        "rdctl-no": true,
-+        "vmx-invvpid": false,
-+        "x-l1-cache-per-thread": true,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": true,
-+        "avx10-128": false,
-+        "lbrv": true,
-+        "adx": true,
-+        "ss": false,
-+        "pni": true,
-+        "tsx-ldtrk": false,
-+        "host-cache-info": false,
-+        "ibpb-brtype": true,
-+        "svm-lock": false,
-+        "svm_lock": false,
-+        "pfthreshold": true,
-+        "smap": true,
-+        "smep": true,
-+        "vmx-invpcid-exit": false,
-+        "amx-int8": false,
-+        "x2apic": true,
-+        "sgx-edeccssa": false,
-+        "avx512vnni": false,
-+        "avx512vbmi": false,
-+        "vmx-apicv-x2apic": false,
-+        "hv-stimer": true,
-+        "kvm-pv-sched-yield": true,
-+        "vmx-invlpg-exit": false,
-+        "x-hv-synic-kvm-only": false,
-+        "no-nested-data-bp": false,
-+        "vmx-invvpid-all-context": false,
-+        "i64": true,
-+        "vmx-activity-hlt": false,
-+        "flushbyasid": true,
-+        "f16c": true,
-+        "fdp-excptn-only": false,
-+        "vmx-exit-ack-intr": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "die-id": -1,
-+        "vmx-tsc-offset": false,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "kvm_nopiodelay": true,
-+        "tm": false,
-+        "hv-enforce-cpuid": false,
-+        "fbsdp-no": false,
-+        "kvmclock-stable-bit": true,
-+        "vmx-rdtsc-exit": false,
-+        "hypervisor": true,
-+        "vmx-rdtscp-exit": false,
-+        "socket-id": -1,
-+        "mds-no": true,
-+        "pcommit": false,
-+        "vmx-vpid": false,
-+        "syscall": true,
-+        "kvm-asyncpf-vmexit": true,
-+        "level": 16,
-+        "avx512dq": false,
-+        "x-migrate-smi-count": true,
-+        "svm": true,
-+        "full-cpuid-auto-level": true,
-+        "hv-avic": true,
-+        "hv-reset": true,
-+        "invtsc": true,
-+        "vmx-monitor-exit": false,
-+        "sse2": true,
-+        "vmx-wbinvd-exit": false,
-+        "ssbd": true,
-+        "sse3": true,
-+        "est": false,
-+        "kvm-poll-control": true,
-+        "kvm_poll_control": true,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "start-powered-off": false,
-+        "zero-fcs-fds": false,
-+        "kvm-pv-eoi": true,
-+        "kvm-pv-ipi": true,
-+        "hv-emsr-bitmap": true,
-+        "cx8": true,
-+        "vmx-invvpid-single-addr": false,
-+        "waitpkg": false,
-+        "sgx-tokenkey": false,
-+        "cldemote": false,
-+        "vmx-ept": false,
-+        "pbrsb-no": false,
-+        "hv-tlbflush-direct": true,
-+        "avx10-version": 0,
-+        "xfd": false,
-+        "lkgs": false,
-+        "hv-reenlightenment": true,
-+        "kvm-mmu": false,
-+        "kvm_mmu": false,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "sse4_2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "vmx-entry-load-bndcfgs": false,
-+        "pdcm": false,
-+        "nodeid_msr": false,
-+        "vmx-exit-clear-rtit-ctl": false,
-+        "stibp-always-on": false,
-+        "hv-apicv": true,
-+        "model": 113,
-+        "movbe": true,
-+        "nrip-save": true,
-+        "nrip_save": true,
-+        "vmx-pause-exit": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "kvm-msi-ext-dest-id": false,
-+        "kvm_pv_unhalt": true,
-+        "sgx-debug": false,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "sgx-mode64": false,
-+        "tsc-deadline": true,
-+        "skip-l1dfl-vmentry": true,
-+        "vmx-exit-load-perf-global-ctrl": false,
-+        "fma": true,
-+        "lam": false,
-+        "cx16": true,
-+        "fzrm": false,
-+        "de": true,
-+        "avx-ifma": false,
-+        "hv-version-id-build": 14393,
-+        "enforce": false,
-+        "stepping": 0,
-+        "xsave": true,
-+        "vmx-entry-load-fred": false,
-+        "lbr-fmt": 18446744073709551552,
-+        "lbr_fmt": 18446744073709551552,
-+        "clflush": true,
-+        "skinit": false,
-+        "avx-vnni-int8": false,
-+        "srso-no": false,
-+        "vmx-exit-secondary-ctls": false,
-+        "tsc": true,
-+        "tce": false,
-+        "flush-l1d": false,
-+        "kvm_asyncpf_int": true,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "fma4": false,
-+        "host-phys-bits": true,
-+        "sgx-kss": false,
-+        "vmx-exit-nosave-debugctl": false,
-+        "hv-version-id-major": 10,
-+        "vmx-invept": false,
-+        "la57": false,
-+        "osvw": true,
-+        "migratable": false,
-+        "rfds-clear": false,
-+        "check": true,
-+        "succor": true,
-+        "hv-spinlocks": 4095,
-+        "vmx-entry-noload-debugctl": false,
-+        "vmx-eptad": false,
-+        "pmu": true,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": false,
-+        "vmx-posted-intr": false,
-+        "vmx-apicv-register": false,
-+        "min-xlevel2": 0,
-+        "vnmi": false,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "psdp-no": false,
-+        "kvm_steal_time": true,
-+        "vmx-any-errcode": false,
-+        "avx512-vp2intersect": false,
-+        "kvmclock": true,
-+        "vmx-zero-len-inject": false,
-+        "amx-complex": false,
-+        "avx-vnni-int16": false,
-+        "l3-cache": true,
-+        "pschange-mc-no": true,
-+        "v-vmsave-vmload": true,
-+        "sgx-provisionkey": false,
-+        "vmx-rdrand-exit": false,
-+        "lwp": false,
-+        "ipred-ctrl": false,
-+        "hv-passthrough": true,
-+        "amd-ssbd": true,
-+        "avx10-256": false,
-+        "ibpb": true,
-+        "ibrs": false,
-+        "xop": false,
-+        "core-capability": false,
-+        "avx": true,
-+        "vmx-invept-single-context": false,
-+        "movdiri": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "hv-vapic": true,
-+        "vmx-ept-2mb": false,
-+        "vmx-ept-1gb": false,
-+        "ht": false,
-+        "vmx-io-exit": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "vaes": false,
-+        "serialize": false,
-+        "xsaves": false,
-+        "movdir64b": false,
-+        "vmx-shadow-vmcs": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "vmx-exit-save-preemption-timer": false,
-+        "vmx-entry-load-pat": false,
-+        "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,
-+        "umip": true,
-+        "vmx-movdr-exit": false,
-+        "avx2": true,
-+        "pse": true,
-+        "avic": false,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "vmx-cr3-load-noexit": false,
-+        "virt-ssbd": true,
-+        "x-hv-max-vps": 4096,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "sbpb": false,
-+        "split-lock-detect": false,
-+        "kvm": true,
-+        "misalignsse": true,
-+        "min-xlevel": 2147483681,
-+        "realized": false,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "xen-vapic": false,
-+        "tsc-scale": true,
-+        "tsc_scale": true,
-+        "topoext": false,
-+        "amd-stibp": true,
-+        "hv-vpindex": true,
-+        "hv-no-nonarch-coresharing": "off",
-+        "ucode-rev": 0,
-+        "vmx-preemption-timer": false,
-+        "xlevel2": 0,
-+        "vmx-entry-load-pkrs": false,
-+        "clflushopt": true,
-+        "avx10-512": false,
-+        "vmx-vnmi-pending": false,
-+        "monitor": false,
-+        "vmx-vintr-pending": false,
-+        "avx512er": false,
-+        "full-width-write": false,
-+        "pmm-en": false,
-+        "taa-no": false,
-+        "avx10": false,
-+        "pcid": false,
-+        "vgif": true,
-+        "vmx-secondary-ctls": false,
-+        "arch-capabilities": true,
-+        "vmx-xsaves": false,
-+        "x-vendor-cpuid-only": true,
-+        "clzero": true,
-+        "3dnow": false,
-+        "erms": false,
-+        "x-force-features": false,
-+        "vmx-entry-ia32e-mode": false,
-+        "lahf-lm": true,
-+        "overflow-recov": true,
-+        "lahf_lm": true,
-+        "vmx-ins-outs": false,
-+        "vpclmulqdq": false,
-+        "xstore": false,
-+        "fxsr-opt": true,
-+        "hv-synic": true,
-+        "fxsr_opt": true,
-+        "sgx-aex-notify": false,
-+        "rtm": false,
-+        "kvm-hint-dedicated": false,
-+        "bhi-ctrl": false,
-+        "amx-bf16": false,
-+        "lmce": false,
-+        "hv-time": true,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "hv-tlbflush": true,
-+        "ffxsr": true,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "bhi-no": false,
-+        "cmpccxadd": false,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "xsaveerptr": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "vmx-activity-wait-sipi": false,
-+        "module-id": -1,
-+        "tbm": false,
-+        "vmx-rdpmc-exit": false,
-+        "wdt": false,
-+        "vmx-entry-load-efer": false,
-+        "level-func7": 0,
-+        "vmx-mtf": false,
-+        "hv-tlbflush-ext": true,
-+        "eraps": false,
-+        "pause_filter": true,
-+        "wrmsrns": false,
-+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
-+        "sha-ni": true,
-+        "rrsba-ctrl": false,
-+        "vmx-exit-load-pkrs": false,
-+        "fb-clear": false,
-+        "abm": true,
-+        "sha512": false,
-+        "vmx-ept-advanced-exitinfo": false,
-+        "vmx-enable-user-wait-pause": false,
-+        "avx512pf": false,
-+        "vmx-hlt-exit": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-51"
-+}
-+
-+{
-+  "execute": "qmp_capabilities",
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "return": {},
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "execute": "query-cpu-definitions",
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "max",
-+      "typename": "max-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [
-+        "kvm"
-+      ],
-+      "static": false,
-+      "migration-safe": false,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "qemu64-v1",
-+      "typename": "qemu64-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "qemu64-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "qemu32-v1",
-+      "typename": "qemu32-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "qemu32-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "phenom-v1",
-+      "typename": "phenom-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt"
-+      ],
-+      "alias-of": "phenom-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium3-v1",
-+      "typename": "pentium3-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "pentium3-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium2-v1",
-+      "typename": "pentium2-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "pentium2-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium-v1",
-+      "typename": "pentium-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "pentium-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "n270-v1",
-+      "typename": "n270-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "n270-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "kvm64-v1",
-+      "typename": "kvm64-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "kvm64-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "kvm32-v1",
-+      "typename": "kvm32-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "kvm32-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "coreduo-v1",
-+      "typename": "coreduo-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "coreduo-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "core2duo-v1",
-+      "typename": "core2duo-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "core2duo-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "athlon-v1",
-+      "typename": "athlon-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "athlon-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Westmere-v2",
-+      "typename": "Westmere-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Westmere-v1",
-+      "typename": "Westmere-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Westmere-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Westmere-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Snowridge-v4",
-+      "typename": "Snowridge-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "gfni",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Snowridge-v3",
-+      "typename": "Snowridge-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "gfni",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "core-capability",
-+        "ssbd",
-+        "xsavec",
-+        "xsaves",
-+        "split-lock-detect"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Snowridge-v2",
-+      "typename": "Snowridge-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "gfni",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "core-capability",
-+        "ssbd",
-+        "xsavec",
-+        "split-lock-detect"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Snowridge-v1",
-+      "typename": "Snowridge-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "gfni",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "core-capability",
-+        "ssbd",
-+        "xsavec",
-+        "split-lock-detect"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Snowridge",
-+      "typename": "Snowridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "gfni",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "core-capability",
-+        "ssbd",
-+        "xsavec",
-+        "split-lock-detect"
-+      ],
-+      "alias-of": "Snowridge-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-v5",
-+      "typename": "Skylake-Server-v5-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "spec-ctrl",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-v4",
-+      "typename": "Skylake-Server-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "spec-ctrl",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-v3",
-+      "typename": "Skylake-Server-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "spec-ctrl",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-v2",
-+      "typename": "Skylake-Server-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "spec-ctrl",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-v1",
-+      "typename": "Skylake-Server-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-noTSX-IBRS",
-+      "typename": "Skylake-Server-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "spec-ctrl",
-+        "xsavec"
-+      ],
-+      "alias-of": "Skylake-Server-v3",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS",
-+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "spec-ctrl",
-+        "xsavec"
-+      ],
-+      "alias-of": "Skylake-Server-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "xsavec"
-+      ],
-+      "alias-of": "Skylake-Server-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-v4",
-+      "typename": "Skylake-Client-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "spec-ctrl",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-v3",
-+      "typename": "Skylake-Client-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "spec-ctrl",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-v2",
-+      "typename": "Skylake-Client-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-v1",
-+      "typename": "Skylake-Client-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-noTSX-IBRS",
-+      "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "spec-ctrl",
-+        "xsavec"
-+      ],
-+      "alias-of": "Skylake-Client-v3",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl",
-+        "xsavec"
-+      ],
-+      "alias-of": "Skylake-Client-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "xsavec"
-+      ],
-+      "alias-of": "Skylake-Client-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SierraForest-v2",
-+      "typename": "SierraForest-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "tsc-adjust",
-+        "invpcid",
-+        "gfni",
-+        "vpclmulqdq",
-+        "bus-lock-detect",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "serialize",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "avx-vnni",
-+        "avx-ifma",
-+        "lam",
-+        "xsavec",
-+        "xsaves",
-+        "avx-vnni-int8",
-+        "avx-ne-convert",
-+        "intel-psfd",
-+        "ipred-ctrl",
-+        "rrsba-ctrl",
-+        "bhi-ctrl",
-+        "mcdt-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SierraForest-v1",
-+      "typename": "SierraForest-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "gfni",
-+        "vpclmulqdq",
-+        "bus-lock-detect",
-+        "serialize",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "avx-vnni",
-+        "avx-ifma",
-+        "xsavec",
-+        "xsaves",
-+        "avx-vnni-int8",
-+        "avx-ne-convert",
-+        "mcdt-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SierraForest",
-+      "typename": "SierraForest-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "gfni",
-+        "vpclmulqdq",
-+        "bus-lock-detect",
-+        "serialize",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "avx-vnni",
-+        "avx-ifma",
-+        "xsavec",
-+        "xsaves",
-+        "avx-vnni-int8",
-+        "avx-ne-convert",
-+        "mcdt-no"
-+      ],
-+      "alias-of": "SierraForest-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SapphireRapids-v3",
-+      "typename": "SapphireRapids-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "tsc-adjust",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "bus-lock-detect",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "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-v2",
-+      "typename": "SapphireRapids-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "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",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "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",
-+      "typename": "SapphireRapids-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "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"
-+      ],
-+      "alias-of": "SapphireRapids-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SandyBridge-v2",
-+      "typename": "SandyBridge-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SandyBridge-v1",
-+      "typename": "SandyBridge-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "SandyBridge-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline"
-+      ],
-+      "alias-of": "SandyBridge-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Penryn-v1",
-+      "typename": "Penryn-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Penryn-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G5-v1",
-+      "typename": "Opteron_G5-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "tbm",
-+        "nrip-save"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "tbm",
-+        "nrip-save"
-+      ],
-+      "alias-of": "Opteron_G5-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G4-v1",
-+      "typename": "Opteron_G4-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "nrip-save"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "nrip-save"
-+      ],
-+      "alias-of": "Opteron_G4-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G3-v1",
-+      "typename": "Opteron_G3-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "misalignsse"
-+      ],
-+      "alias-of": "Opteron_G3-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G2-v1",
-+      "typename": "Opteron_G2-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Opteron_G2-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G1-v1",
-+      "typename": "Opteron_G1-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Opteron_G1-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Nehalem-v2",
-+      "typename": "Nehalem-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Nehalem-v1",
-+      "typename": "Nehalem-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Nehalem-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Nehalem-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "KnightsMill-v1",
-+      "typename": "KnightsMill-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "avx512f",
-+        "avx512pf",
-+        "avx512er",
-+        "avx512cd",
-+        "avx512-vpopcntdq",
-+        "avx512-4vnniw",
-+        "avx512-4fmaps"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "KnightsMill",
-+      "typename": "KnightsMill-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "avx512f",
-+        "avx512pf",
-+        "avx512er",
-+        "avx512cd",
-+        "avx512-vpopcntdq",
-+        "avx512-4vnniw",
-+        "avx512-4fmaps"
-+      ],
-+      "alias-of": "KnightsMill-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "IvyBridge-v2",
-+      "typename": "IvyBridge-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "IvyBridge-v1",
-+      "typename": "IvyBridge-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "IvyBridge-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline"
-+      ],
-+      "alias-of": "IvyBridge-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v7",
-+      "typename": "Icelake-Server-v7-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v6",
-+      "typename": "Icelake-Server-v6-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v5",
-+      "typename": "Icelake-Server-v5-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v4",
-+      "typename": "Icelake-Server-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v3",
-+      "typename": "Icelake-Server-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v2",
-+      "typename": "Icelake-Server-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "spec-ctrl",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-v1",
-+      "typename": "Icelake-Server-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "spec-ctrl",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server-noTSX",
-+      "typename": "Icelake-Server-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "spec-ctrl",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "alias-of": "Icelake-Server-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Icelake-Server",
-+      "typename": "Icelake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "spec-ctrl",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "alias-of": "Icelake-Server-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-v4",
-+      "typename": "Haswell-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-v3",
-+      "typename": "Haswell-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-v2",
-+      "typename": "Haswell-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-v1",
-+      "typename": "Haswell-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Haswell-v4",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid"
-+      ],
-+      "alias-of": "Haswell-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Haswell-v3",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "alias-of": "Haswell-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "GraniteRapids-v2",
-+      "typename": "GraniteRapids-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "tsc-adjust",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "bus-lock-detect",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "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",
-+        "avx10",
-+        "mcdt-no",
-+        "avx10-128",
-+        "avx10-256",
-+        "avx10-512"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "GraniteRapids-v1",
-+      "typename": "GraniteRapids-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "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",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "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": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "nrip-save",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-v3",
-+      "typename": "EPYC-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "nrip-save",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-v2",
-+      "typename": "EPYC-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "ibpb",
-+        "nrip-save",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-v1",
-+      "typename": "EPYC-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "nrip-save",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Rome-v4",
-+      "typename": "EPYC-Rome-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "ibrs",
-+        "amd-stibp",
-+        "amd-ssbd",
-+        "nrip-save",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Rome-v3",
-+      "typename": "EPYC-Rome-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "ibrs",
-+        "amd-stibp",
-+        "amd-ssbd",
-+        "nrip-save",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Rome-v2",
-+      "typename": "EPYC-Rome-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "ibrs",
-+        "amd-stibp",
-+        "amd-ssbd",
-+        "nrip-save",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Rome-v1",
-+      "typename": "EPYC-Rome-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "amd-stibp",
-+        "nrip-save",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Rome",
-+      "typename": "EPYC-Rome-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "amd-stibp",
-+        "nrip-save",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "alias-of": "EPYC-Rome-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Milan-v2",
-+      "typename": "EPYC-Milan-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "invpcid",
-+        "vpclmulqdq",
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "ibrs",
-+        "amd-stibp",
-+        "stibp-always-on",
-+        "amd-ssbd",
-+        "amd-psfd",
-+        "no-nested-data-bp",
-+        "lfence-always-serializing",
-+        "null-sel-clr-base",
-+        "nrip-save",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Milan-v1",
-+      "typename": "EPYC-Milan-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "invpcid",
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "ibrs",
-+        "amd-stibp",
-+        "amd-ssbd",
-+        "nrip-save",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Milan",
-+      "typename": "EPYC-Milan-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "invpcid",
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "ibrs",
-+        "amd-stibp",
-+        "amd-ssbd",
-+        "nrip-save",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "alias-of": "EPYC-Milan-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-IBPB",
-+      "typename": "EPYC-IBPB-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "ibpb",
-+        "nrip-save",
-+        "xsavec"
-+      ],
-+      "alias-of": "EPYC-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Genoa-v1",
-+      "typename": "EPYC-Genoa-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "avx512-bf16",
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "ibrs",
-+        "amd-stibp",
-+        "stibp-always-on",
-+        "amd-ssbd",
-+        "amd-psfd",
-+        "no-nested-data-bp",
-+        "lfence-always-serializing",
-+        "null-sel-clr-base",
-+        "auto-ibrs",
-+        "nrip-save",
-+        "vnmi",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC-Genoa",
-+      "typename": "EPYC-Genoa-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512ifma",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "avx512-bf16",
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "perfctr-core",
-+        "clzero",
-+        "ibpb",
-+        "ibrs",
-+        "amd-stibp",
-+        "stibp-always-on",
-+        "amd-ssbd",
-+        "amd-psfd",
-+        "no-nested-data-bp",
-+        "lfence-always-serializing",
-+        "null-sel-clr-base",
-+        "auto-ibrs",
-+        "nrip-save",
-+        "vnmi",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "alias-of": "EPYC-Genoa-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "nrip-save",
-+        "xsavec"
-+      ],
-+      "alias-of": "EPYC-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Dhyana-v2",
-+      "typename": "Dhyana-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "ibpb",
-+        "nrip-save",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Dhyana-v1",
-+      "typename": "Dhyana-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "ibpb",
-+        "nrip-save",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Dhyana",
-+      "typename": "Dhyana-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "misalignsse",
-+        "osvw",
-+        "topoext",
-+        "ibpb",
-+        "nrip-save",
-+        "xsavec"
-+      ],
-+      "alias-of": "Dhyana-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Denverton-v3",
-+      "typename": "Denverton-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Denverton-v2",
-+      "typename": "Denverton-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Denverton-v1",
-+      "typename": "Denverton-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Denverton",
-+      "typename": "Denverton-x86_64-cpu",
-+      "unavailable-features": [
-+        "tsc-deadline",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "alias-of": "Denverton-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cooperlake-v2",
-+      "typename": "Cooperlake-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "stibp",
-+        "arch-capabilities",
-+        "ssbd",
-+        "avx512-bf16",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cooperlake-v1",
-+      "typename": "Cooperlake-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "stibp",
-+        "arch-capabilities",
-+        "ssbd",
-+        "avx512-bf16",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cooperlake",
-+      "typename": "Cooperlake-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "stibp",
-+        "arch-capabilities",
-+        "ssbd",
-+        "avx512-bf16",
-+        "xsavec"
-+      ],
-+      "alias-of": "Cooperlake-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Conroe-v1",
-+      "typename": "Conroe-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "Conroe-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "ClearwaterForest-v1",
-+      "typename": "ClearwaterForest-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "tsc-adjust",
-+        "invpcid",
-+        "gfni",
-+        "vpclmulqdq",
-+        "bus-lock-detect",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "serialize",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "sha512",
-+        "sm3",
-+        "sm4",
-+        "avx-vnni",
-+        "avx-ifma",
-+        "lam",
-+        "xsavec",
-+        "xsaves",
-+        "avx-vnni-int8",
-+        "avx-ne-convert",
-+        "avx-vnni-int16",
-+        "prefetchiti",
-+        "intel-psfd",
-+        "ipred-ctrl",
-+        "rrsba-ctrl",
-+        "ddpd-u",
-+        "bhi-ctrl",
-+        "mcdt-no"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "ClearwaterForest",
-+      "typename": "ClearwaterForest-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "tsc-adjust",
-+        "invpcid",
-+        "gfni",
-+        "vpclmulqdq",
-+        "bus-lock-detect",
-+        "cldemote",
-+        "movdiri",
-+        "movdir64b",
-+        "serialize",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "sha512",
-+        "sm3",
-+        "sm4",
-+        "avx-vnni",
-+        "avx-ifma",
-+        "lam",
-+        "xsavec",
-+        "xsaves",
-+        "avx-vnni-int8",
-+        "avx-ne-convert",
-+        "avx-vnni-int16",
-+        "prefetchiti",
-+        "intel-psfd",
-+        "ipred-ctrl",
-+        "rrsba-ctrl",
-+        "ddpd-u",
-+        "bhi-ctrl",
-+        "mcdt-no"
-+      ],
-+      "alias-of": "ClearwaterForest-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-v5",
-+      "typename": "Cascadelake-Server-v5-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec",
-+        "xsaves"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-v4",
-+      "typename": "Cascadelake-Server-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-v3",
-+      "typename": "Cascadelake-Server-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-v2",
-+      "typename": "Cascadelake-Server-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-v1",
-+      "typename": "Cascadelake-Server-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server-noTSX",
-+      "typename": "Cascadelake-Server-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "arch-capabilities",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "alias-of": "Cascadelake-Server-v3",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Cascadelake-Server",
-+      "typename": "Cascadelake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vnni",
-+        "spec-ctrl",
-+        "ssbd",
-+        "xsavec"
-+      ],
-+      "alias-of": "Cascadelake-Server-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-v4",
-+      "typename": "Broadwell-v4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-v3",
-+      "typename": "Broadwell-v3-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-v2",
-+      "typename": "Broadwell-v2-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-v1",
-+      "typename": "Broadwell-v1-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Broadwell-v4",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "invpcid"
-+      ],
-+      "alias-of": "Broadwell-v2",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl"
-+      ],
-+      "alias-of": "Broadwell-v3",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [
-+        "pcid",
-+        "tsc-deadline",
-+        "hle",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "alias-of": "Broadwell-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "486-v1",
-+      "typename": "486-v1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [],
-+      "alias-of": "486-v1",
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    }
-+  ],
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "max"
-+    }
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "avx-ne-convert": false,
-+        "vmx-entry-load-rtit-ctl": false,
-+        "svme-addr-chk": true,
-+        "lfence-always-serializing": false,
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "vmx-apicv-xapic": false,
-+        "mmx": true,
-+        "rdpid": true,
-+        "arat": true,
-+        "vmx-page-walk-4": false,
-+        "vmx-page-walk-5": false,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "vmx-desc-exit": false,
-+        "pause-filter": false,
-+        "mcdt-no": false,
-+        "bus-lock-detect": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "vmx-tsc-scaling": false,
-+        "prefetchiti": false,
-+        "vmx-cr8-store-exit": false,
-+        "vmx-rdseed-exit": false,
-+        "amx-fp16": false,
-+        "fred": false,
-+        "vmx-eptp-switching": false,
-+        "ddpd-u": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "auto-ibrs": false,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "vmx-exit-load-efer": false,
-+        "vmx-exit-clear-bndcfgs": false,
-+        "vmx-nested-exception": false,
-+        "sse4.1": true,
-+        "family": 0,
-+        "intel-pt-lip": false,
-+        "vmx-vmwrite-vmexit-fields": false,
-+        "kvm-asyncpf-int": false,
-+        "vmx-vnmi": false,
-+        "vmx-true-ctls": false,
-+        "vmx-ept-execonly": false,
-+        "vmx-exit-save-efer": false,
-+        "vmx-invept-all-context": false,
-+        "wbnoinvd": true,
-+        "avx512f": false,
-+        "rfds-no": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "sgx": false,
-+        "srso-user-kernel-no": false,
-+        "vmx-exit-load-pat": false,
-+        "vmx-intr-exit": false,
-+        "min-level": 13,
-+        "vmx-flexpriority": false,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "sgx-exinfo": false,
-+        "intel-psfd": false,
-+        "amd-psfd": false,
-+        "gds-no": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "avx512-fp16": false,
-+        "avx512-bf16": false,
-+        "vmx-cr8-load-exit": false,
-+        "xsaveopt": true,
-+        "arch-lbr": false,
-+        "vmx-apicv-vid": false,
-+        "vmx-exit-save-pat": false,
-+        "xtpr": false,
-+        "tsx-ctrl": false,
-+        "vmx-ple": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "vmx-vmfunc": false,
-+        "vmx-activity-shutdown": false,
-+        "sgx1": false,
-+        "sgx2": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "vmx-encls-exit": false,
-+        "null-sel-clr-base": false,
-+        "stibp": false,
-+        "vmx-msr-bitmap": false,
-+        "xcrypt-en": false,
-+        "vmx-mwait-exit": false,
-+        "vmx-pml": false,
-+        "vmx-nmi-exit": false,
-+        "amx-tile": false,
-+        "vmx-invept-single-context-noglobals": false,
-+        "pn": false,
-+        "rsba": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "vmx-unrestricted-guest": false,
-+        "vmx-cr3-store-noexit": false,
-+        "pku": true,
-+        "pks": true,
-+        "smx": false,
-+        "sm3": false,
-+        "sm4": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "avx-vnni": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "npt": true,
-+        "sgxlc": false,
-+        "perfmon-v2": false,
-+        "rdctl-no": false,
-+        "vmx-invvpid": false,
-+        "clwb": true,
-+        "avx10-128": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "tsx-ldtrk": false,
-+        "ibpb-brtype": false,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "vmx-invpcid-exit": false,
-+        "amx-int8": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "sgx-edeccssa": false,
-+        "vmx-apicv-x2apic": false,
-+        "kvm-pv-sched-yield": false,
-+        "vmx-invlpg-exit": false,
-+        "no-nested-data-bp": false,
-+        "vmx-invvpid-all-context": false,
-+        "vmx-activity-hlt": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "fdp-excptn-only": false,
-+        "vmx-exit-ack-intr": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "vmx-tsc-offset": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "fbsdp-no": false,
-+        "kvmclock-stable-bit": false,
-+        "vmx-rdtsc-exit": false,
-+        "hypervisor": true,
-+        "vmx-rdtscp-exit": false,
-+        "mds-no": false,
-+        "pcommit": false,
-+        "vmx-vpid": false,
-+        "syscall": true,
-+        "kvm-asyncpf-vmexit": false,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "vmx-monitor-exit": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "vmx-wbinvd-exit": false,
-+        "est": false,
-+        "kvm-poll-control": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "zero-fcs-fds": false,
-+        "kvm-pv-eoi": false,
-+        "kvm-pv-ipi": false,
-+        "cx8": true,
-+        "vmx-invvpid-single-addr": false,
-+        "waitpkg": false,
-+        "cldemote": false,
-+        "sgx-tokenkey": false,
-+        "vmx-ept": false,
-+        "pbrsb-no": false,
-+        "xfd": false,
-+        "lkgs": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "vmx-entry-load-bndcfgs": false,
-+        "vmx-exit-clear-rtit-ctl": false,
-+        "stibp-always-on": false,
-+        "model": 0,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "kvm-msi-ext-dest-id": false,
-+        "vmx-pause-exit": false,
-+        "invpcid": false,
-+        "sgx-debug": false,
-+        "pdpe1gb": true,
-+        "sgx-mode64": false,
-+        "tsc-deadline": false,
-+        "skip-l1dfl-vmentry": false,
-+        "vmx-exit-load-perf-global-ctrl": false,
-+        "fma": true,
-+        "lam": false,
-+        "cx16": true,
-+        "de": true,
-+        "fzrm": true,
-+        "avx-ifma": false,
-+        "stepping": 0,
-+        "xsave": true,
-+        "vmx-entry-load-fred": false,
-+        "clflush": true,
-+        "skinit": false,
-+        "srso-no": false,
-+        "avx-vnni-int8": false,
-+        "vmx-exit-secondary-ctls": false,
-+        "tsc": true,
-+        "tce": false,
-+        "flush-l1d": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "vmx-exit-nosave-debugctl": false,
-+        "sgx-kss": false,
-+        "la57": true,
-+        "vmx-invept": false,
-+        "osvw": false,
-+        "rfds-clear": false,
-+        "succor": false,
-+        "apic": true,
-+        "pmm": false,
-+        "vmx-entry-noload-debugctl": false,
-+        "vmx-eptad": false,
-+        "spec-ctrl": false,
-+        "vmx-posted-intr": false,
-+        "vmx-apicv-register": false,
-+        "tsc-adjust": false,
-+        "vnmi": false,
-+        "kvm-steal-time": false,
-+        "psdp-no": false,
-+        "vmx-any-errcode": false,
-+        "avx512-vp2intersect": false,
-+        "kvmclock": false,
-+        "vmx-zero-len-inject": false,
-+        "amx-complex": false,
-+        "avx-vnni-int16": false,
-+        "pschange-mc-no": false,
-+        "v-vmsave-vmload": false,
-+        "vmx-rdrand-exit": false,
-+        "sgx-provisionkey": false,
-+        "lwp": false,
-+        "ipred-ctrl": false,
-+        "amd-ssbd": false,
-+        "avx10-256": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "ibrs": false,
-+        "avx": true,
-+        "core-capability": false,
-+        "vmx-invept-single-context": false,
-+        "movdiri": false,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "vmx-ept-2mb": false,
-+        "vmx-ept-1gb": false,
-+        "ht": false,
-+        "vmx-io-exit": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "vaes": true,
-+        "serialize": false,
-+        "movdir64b": false,
-+        "xsaves": false,
-+        "vmx-shadow-vmcs": false,
-+        "lm": true,
-+        "vmx-exit-save-preemption-timer": false,
-+        "vmx-entry-load-pat": false,
-+        "fsrm": true,
-+        "fsrs": true,
-+        "fsrc": true,
-+        "sbdr-ssdp-no": false,
-+        "vmx-entry-load-perf-global-ctrl": false,
-+        "vmx-io-bitmap": false,
-+        "umip": true,
-+        "vmx-store-lma": false,
-+        "vmx-movdr-exit": false,
-+        "pse": true,
-+        "avx2": true,
-+        "avic": false,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "vmx-cr3-load-noexit": false,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "sbpb": false,
-+        "misalignsse": false,
-+        "split-lock-detect": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "amd-stibp": false,
-+        "vmx-preemption-timer": false,
-+        "clflushopt": true,
-+        "vmx-entry-load-pkrs": false,
-+        "avx10-512": false,
-+        "vmx-vnmi-pending": false,
-+        "monitor": true,
-+        "vmx-vintr-pending": false,
-+        "avx512er": false,
-+        "full-width-write": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "taa-no": false,
-+        "avx10": false,
-+        "arch-capabilities": false,
-+        "vgif": true,
-+        "vmx-secondary-ctls": false,
-+        "vmx-xsaves": false,
-+        "clzero": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "vmx-entry-ia32e-mode": false,
-+        "lahf-lm": true,
-+        "overflow-recov": false,
-+        "vpclmulqdq": false,
-+        "vmx-ins-outs": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "kvm-hint-dedicated": false,
-+        "sgx-aex-notify": false,
-+        "bhi-ctrl": false,
-+        "amx-bf16": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "cmpccxadd": true,
-+        "bhi-no": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "xsaveerptr": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "vmx-activity-wait-sipi": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "vmx-rdpmc-exit": false,
-+        "vmx-mtf": false,
-+        "vmx-entry-load-efer": false,
-+        "eraps": false,
-+        "wrmsrns": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": true,
-+        "rrsba-ctrl": false,
-+        "fb-clear": false,
-+        "vmx-exit-load-pkrs": false,
-+        "abm": true,
-+        "sha512": false,
-+        "vmx-ept-advanced-exitinfo": false,
-+        "vmx-enable-user-wait-pause": false,
-+        "avx512pf": false,
-+        "vmx-hlt-exit": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "max",
-+      "props": {
-+        "migratable": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "avx-ne-convert": false,
-+        "vmx-entry-load-rtit-ctl": false,
-+        "svme-addr-chk": true,
-+        "lfence-always-serializing": false,
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "vmx-apicv-xapic": false,
-+        "mmx": true,
-+        "rdpid": true,
-+        "arat": true,
-+        "vmx-page-walk-4": false,
-+        "vmx-page-walk-5": false,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "vmx-desc-exit": false,
-+        "pause-filter": false,
-+        "mcdt-no": false,
-+        "bus-lock-detect": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "vmx-tsc-scaling": false,
-+        "prefetchiti": false,
-+        "vmx-cr8-store-exit": false,
-+        "vmx-rdseed-exit": false,
-+        "amx-fp16": false,
-+        "fred": false,
-+        "vmx-eptp-switching": false,
-+        "ddpd-u": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "auto-ibrs": false,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "vmx-exit-load-efer": false,
-+        "vmx-exit-clear-bndcfgs": false,
-+        "vmx-nested-exception": false,
-+        "sse4.1": true,
-+        "family": 0,
-+        "intel-pt-lip": false,
-+        "vmx-vmwrite-vmexit-fields": false,
-+        "kvm-asyncpf-int": false,
-+        "vmx-vnmi": false,
-+        "vmx-true-ctls": false,
-+        "vmx-ept-execonly": false,
-+        "vmx-exit-save-efer": false,
-+        "vmx-invept-all-context": false,
-+        "wbnoinvd": true,
-+        "avx512f": false,
-+        "rfds-no": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "sgx": false,
-+        "srso-user-kernel-no": false,
-+        "vmx-exit-load-pat": false,
-+        "vmx-intr-exit": false,
-+        "min-level": 13,
-+        "vmx-flexpriority": false,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "sgx-exinfo": false,
-+        "intel-psfd": false,
-+        "amd-psfd": false,
-+        "gds-no": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "avx512-fp16": false,
-+        "avx512-bf16": false,
-+        "vmx-cr8-load-exit": false,
-+        "xsaveopt": true,
-+        "arch-lbr": false,
-+        "vmx-apicv-vid": false,
-+        "vmx-exit-save-pat": false,
-+        "xtpr": false,
-+        "tsx-ctrl": false,
-+        "vmx-ple": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "vmx-vmfunc": false,
-+        "vmx-activity-shutdown": false,
-+        "sgx1": false,
-+        "sgx2": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "vmx-encls-exit": false,
-+        "null-sel-clr-base": false,
-+        "stibp": false,
-+        "vmx-msr-bitmap": false,
-+        "xcrypt-en": false,
-+        "vmx-mwait-exit": false,
-+        "vmx-pml": false,
-+        "vmx-nmi-exit": false,
-+        "amx-tile": false,
-+        "vmx-invept-single-context-noglobals": false,
-+        "pn": false,
-+        "rsba": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "vmx-unrestricted-guest": false,
-+        "vmx-cr3-store-noexit": false,
-+        "pku": true,
-+        "pks": true,
-+        "smx": false,
-+        "sm3": false,
-+        "sm4": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "avx-vnni": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "npt": true,
-+        "sgxlc": false,
-+        "perfmon-v2": false,
-+        "rdctl-no": false,
-+        "vmx-invvpid": false,
-+        "clwb": true,
-+        "avx10-128": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "tsx-ldtrk": false,
-+        "ibpb-brtype": false,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "vmx-invpcid-exit": false,
-+        "amx-int8": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "sgx-edeccssa": false,
-+        "vmx-apicv-x2apic": false,
-+        "kvm-pv-sched-yield": false,
-+        "vmx-invlpg-exit": false,
-+        "no-nested-data-bp": false,
-+        "vmx-invvpid-all-context": false,
-+        "vmx-activity-hlt": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "fdp-excptn-only": false,
-+        "vmx-exit-ack-intr": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "vmx-tsc-offset": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "fbsdp-no": false,
-+        "kvmclock-stable-bit": false,
-+        "vmx-rdtsc-exit": false,
-+        "hypervisor": true,
-+        "vmx-rdtscp-exit": false,
-+        "mds-no": false,
-+        "pcommit": false,
-+        "vmx-vpid": false,
-+        "syscall": true,
-+        "kvm-asyncpf-vmexit": false,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "vmx-monitor-exit": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "vmx-wbinvd-exit": false,
-+        "est": false,
-+        "kvm-poll-control": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "zero-fcs-fds": false,
-+        "kvm-pv-eoi": false,
-+        "kvm-pv-ipi": false,
-+        "cx8": true,
-+        "vmx-invvpid-single-addr": false,
-+        "waitpkg": false,
-+        "cldemote": false,
-+        "sgx-tokenkey": false,
-+        "vmx-ept": false,
-+        "pbrsb-no": false,
-+        "xfd": false,
-+        "lkgs": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "vmx-entry-load-bndcfgs": false,
-+        "vmx-exit-clear-rtit-ctl": false,
-+        "stibp-always-on": false,
-+        "model": 0,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "kvm-msi-ext-dest-id": false,
-+        "vmx-pause-exit": false,
-+        "invpcid": false,
-+        "sgx-debug": false,
-+        "pdpe1gb": true,
-+        "sgx-mode64": false,
-+        "tsc-deadline": false,
-+        "skip-l1dfl-vmentry": false,
-+        "vmx-exit-load-perf-global-ctrl": false,
-+        "fma": true,
-+        "lam": false,
-+        "cx16": true,
-+        "de": true,
-+        "fzrm": true,
-+        "avx-ifma": false,
-+        "stepping": 0,
-+        "xsave": true,
-+        "vmx-entry-load-fred": false,
-+        "clflush": true,
-+        "skinit": false,
-+        "srso-no": false,
-+        "avx-vnni-int8": false,
-+        "vmx-exit-secondary-ctls": false,
-+        "tsc": true,
-+        "tce": false,
-+        "flush-l1d": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "vmx-exit-nosave-debugctl": false,
-+        "sgx-kss": false,
-+        "la57": true,
-+        "vmx-invept": false,
-+        "osvw": false,
-+        "rfds-clear": false,
-+        "succor": false,
-+        "apic": true,
-+        "pmm": false,
-+        "vmx-entry-noload-debugctl": false,
-+        "vmx-eptad": false,
-+        "spec-ctrl": false,
-+        "vmx-posted-intr": false,
-+        "vmx-apicv-register": false,
-+        "tsc-adjust": false,
-+        "vnmi": false,
-+        "kvm-steal-time": false,
-+        "psdp-no": false,
-+        "vmx-any-errcode": false,
-+        "avx512-vp2intersect": false,
-+        "kvmclock": false,
-+        "vmx-zero-len-inject": false,
-+        "amx-complex": false,
-+        "avx-vnni-int16": false,
-+        "pschange-mc-no": false,
-+        "v-vmsave-vmload": false,
-+        "vmx-rdrand-exit": false,
-+        "sgx-provisionkey": false,
-+        "lwp": false,
-+        "ipred-ctrl": false,
-+        "amd-ssbd": false,
-+        "avx10-256": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "ibrs": false,
-+        "avx": true,
-+        "core-capability": false,
-+        "vmx-invept-single-context": false,
-+        "movdiri": false,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "vmx-ept-2mb": false,
-+        "vmx-ept-1gb": false,
-+        "ht": false,
-+        "vmx-io-exit": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "vaes": true,
-+        "serialize": false,
-+        "movdir64b": false,
-+        "xsaves": false,
-+        "vmx-shadow-vmcs": false,
-+        "lm": true,
-+        "vmx-exit-save-preemption-timer": false,
-+        "vmx-entry-load-pat": false,
-+        "fsrm": true,
-+        "fsrs": true,
-+        "fsrc": true,
-+        "sbdr-ssdp-no": false,
-+        "vmx-entry-load-perf-global-ctrl": false,
-+        "vmx-io-bitmap": false,
-+        "umip": true,
-+        "vmx-store-lma": false,
-+        "vmx-movdr-exit": false,
-+        "pse": true,
-+        "avx2": true,
-+        "avic": false,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "vmx-cr3-load-noexit": false,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "sbpb": false,
-+        "misalignsse": false,
-+        "split-lock-detect": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "amd-stibp": false,
-+        "vmx-preemption-timer": false,
-+        "clflushopt": true,
-+        "vmx-entry-load-pkrs": false,
-+        "avx10-512": false,
-+        "vmx-vnmi-pending": false,
-+        "monitor": true,
-+        "vmx-vintr-pending": false,
-+        "avx512er": false,
-+        "full-width-write": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "taa-no": false,
-+        "avx10": false,
-+        "arch-capabilities": false,
-+        "vgif": true,
-+        "vmx-secondary-ctls": false,
-+        "vmx-xsaves": false,
-+        "clzero": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "vmx-entry-ia32e-mode": false,
-+        "lahf-lm": true,
-+        "overflow-recov": false,
-+        "vpclmulqdq": false,
-+        "vmx-ins-outs": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "kvm-hint-dedicated": false,
-+        "sgx-aex-notify": false,
-+        "bhi-ctrl": false,
-+        "amx-bf16": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "cmpccxadd": true,
-+        "bhi-no": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "xsaveerptr": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "vmx-activity-wait-sipi": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "vmx-rdpmc-exit": false,
-+        "vmx-mtf": false,
-+        "vmx-entry-load-efer": false,
-+        "eraps": false,
-+        "wrmsrns": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": true,
-+        "rrsba-ctrl": false,
-+        "fb-clear": false,
-+        "vmx-exit-load-pkrs": false,
-+        "abm": true,
-+        "sha512": false,
-+        "vmx-ept-advanced-exitinfo": false,
-+        "vmx-enable-user-wait-pause": false,
-+        "avx512pf": false,
-+        "vmx-hlt-exit": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-5.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.12",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-6.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-4.2",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.5",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-4.2",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-5.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.7",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-9.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 4096,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-7.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-8.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 1024,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "none",
-+      "numa-mem-supported": false,
-+      "acpi": false,
-+      "cpu-max": 1,
-+      "deprecated": false,
-+      "default-ram-id": "ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-8.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.7",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-6.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-9.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.4",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-10.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 4096,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram",
-+      "alias": "q35"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-7.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.10",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "x-remote",
-+      "numa-mem-supported": false,
-+      "acpi": false,
-+      "cpu-max": 1,
-+      "deprecated": false
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-5.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.9",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.11",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-3.1",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-6.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-4.1",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.4",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-4.1",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-5.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.9",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "isapc",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "486-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 1,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.6",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-3.1",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-9.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 4096,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.12",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-7.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-8.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-8.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-6.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.6",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-9.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-4.0.1",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-7.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-5.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.8",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-10.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "is-default": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram",
-+      "alias": "pc"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-9.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 4096,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.10",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-3.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-7.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-4.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-6.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "microvm",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": false,
-+      "default-ram-id": "microvm.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-8.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 1024,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-4.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-8.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-5.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.8",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-6.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-9.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-3.0",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.5",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-7.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 255,
-+      "deprecated": false,
-+      "default-ram-id": "pc.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.11",
-+      "numa-mem-supported": true,
-+      "default-cpu-type": "qemu64-x86_64-cpu",
-+      "acpi": true,
-+      "cpu-max": 288,
-+      "deprecated": true,
-+      "default-ram-id": "pc.ram"
-+    }
-+  ],
-+  "id": "libvirt-5"
-+}
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-new file mode 100644
-index 0000000000..40ad7e797a
---- /dev/null
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-@@ -0,0 +1,4159 @@
-+<qemuCaps>
-+  <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+  <qemuctime>0</qemuctime>
-+  <selfctime>0</selfctime>
-+  <selfvers>0</selfvers>
-+  <flag name='kvm'/>
-+  <flag name='sdl'/>
-+  <flag name='spice'/>
-+  <flag name='hda-duplex'/>
-+  <flag name='ccid-emulated'/>
-+  <flag name='ccid-passthru'/>
-+  <flag name='piix3-usb-uhci'/>
-+  <flag name='piix4-usb-uhci'/>
-+  <flag name='usb-ehci'/>
-+  <flag name='ich9-usb-ehci1'/>
-+  <flag name='pci-ohci'/>
-+  <flag name='usb-redir'/>
-+  <flag name='usb-hub'/>
-+  <flag name='ich9-ahci'/>
-+  <flag name='scsi-disk.channel'/>
-+  <flag name='scsi-block'/>
-+  <flag name='hda-micro'/>
-+  <flag name='nec-usb-xhci'/>
-+  <flag name='lsi'/>
-+  <flag name='virtio-scsi-pci'/>
-+  <flag name='usb-redir.filter'/>
-+  <flag name='seccomp-sandbox'/>
-+  <flag name='vnc'/>
-+  <flag name='qxl'/>
-+  <flag name='VGA'/>
-+  <flag name='cirrus-vga'/>
-+  <flag name='vmware-svga'/>
-+  <flag name='usb-serial'/>
-+  <flag name='virtio-rng'/>
-+  <flag name='rng-random'/>
-+  <flag name='rng-egd'/>
-+  <flag name='megasas'/>
-+  <flag name='tpm-passthrough'/>
-+  <flag name='tpm-tis'/>
-+  <flag name='pci-bridge'/>
-+  <flag name='vfio-pci'/>
-+  <flag name='dmi-to-pci-bridge'/>
-+  <flag name='usb-storage'/>
-+  <flag name='virtio-mmio'/>
-+  <flag name='ich9-intel-hda'/>
-+  <flag name='kvm-pit-lost-tick-policy'/>
-+  <flag name='pvpanic'/>
-+  <flag name='usb-kbd'/>
-+  <flag name='usb-audio'/>
-+  <flag name='rtc-reset-reinjection'/>
-+  <flag name='migrate-rdma'/>
-+  <flag name='VGA.vgamem_mb'/>
-+  <flag name='vmware-svga.vgamem_mb'/>
-+  <flag name='qxl.vgamem_mb'/>
-+  <flag name='pc-dimm'/>
-+  <flag name='machine-vmport-opt'/>
-+  <flag name='pci-serial'/>
-+  <flag name='ioh3420'/>
-+  <flag name='x3130-upstream'/>
-+  <flag name='xio3130-downstream'/>
-+  <flag name='rtl8139'/>
-+  <flag name='e1000'/>
-+  <flag name='virtio-net'/>
-+  <flag name='virtio-gpu'/>
-+  <flag name='virtio-keyboard'/>
-+  <flag name='virtio-mouse'/>
-+  <flag name='virtio-tablet'/>
-+  <flag name='virtio-input-host'/>
-+  <flag name='virtio-balloon-pci.deflate-on-oom'/>
-+  <flag name='mptsas1068'/>
-+  <flag name='spice-gl'/>
-+  <flag name='qxl.vram64_size_mb'/>
-+  <flag name='pxb'/>
-+  <flag name='pxb-pcie'/>
-+  <flag name='intel-iommu'/>
-+  <flag name='virtio-vga'/>
-+  <flag name='ivshmem-plain'/>
-+  <flag name='ivshmem-doorbell'/>
-+  <flag name='vhost-scsi'/>
-+  <flag name='query-cpu-model-expansion'/>
-+  <flag name='spice-rendernode'/>
-+  <flag name='nvdimm'/>
-+  <flag name='pcie-root-port'/>
-+  <flag name='query-cpu-definitions'/>
-+  <flag name='qemu-xhci'/>
-+  <flag name='intel-iommu.intremap'/>
-+  <flag name='intel-iommu.caching-mode'/>
-+  <flag name='intel-iommu.eim'/>
-+  <flag name='intel-iommu.device-iotlb'/>
-+  <flag name='chardev-reconnect'/>
-+  <flag name='vmcoreinfo'/>
-+  <flag name='isa-serial'/>
-+  <flag name='pcie-pci-bridge'/>
-+  <flag name='nbd-tls'/>
-+  <flag name='tpm-crb'/>
-+  <flag name='pr-manager-helper'/>
-+  <flag name='screendump_device'/>
-+  <flag name='hda-output'/>
-+  <flag name='vmgenid'/>
-+  <flag name='vhost-vsock'/>
-+  <flag name='tpm-emulator'/>
-+  <flag name='mch'/>
-+  <flag name='mch.extended-tseg-mbytes'/>
-+  <flag name='egl-headless'/>
-+  <flag name='memory-backend-memfd'/>
-+  <flag name='memory-backend-memfd.hugetlb'/>
-+  <flag name='egl-headless.rendernode'/>
-+  <flag name='memory-backend-file.pmem'/>
-+  <flag name='nvdimm.unarmed'/>
-+  <flag name='virtio-pci-non-transitional'/>
-+  <flag name='nbd-bitmap'/>
-+  <flag name='x86-max-cpu'/>
-+  <flag name='cpu-unavailable-features'/>
-+  <flag name='canonical-cpu-features'/>
-+  <flag name='bochs-display'/>
-+  <flag name='migration-file-drop-cache'/>
-+  <flag name='dbus-vmstate'/>
-+  <flag name='vhost-user-gpu'/>
-+  <flag name='vhost-user-vga'/>
-+  <flag name='incremental-backup'/>
-+  <flag name='ramfb'/>
-+  <flag name='drive-nvme'/>
-+  <flag name='smp-dies'/>
-+  <flag name='i8042'/>
-+  <flag name='rng-builtin'/>
-+  <flag name='vhost-user-fs'/>
-+  <flag name='query-named-block-nodes.flat'/>
-+  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-+  <flag name='blockdev-reopen'/>
-+  <flag name='fsdev.multidevs'/>
-+  <flag name='pcie-root-port.hotplug'/>
-+  <flag name='aio.io_uring'/>
-+  <flag name='tcg'/>
-+  <flag name='pvscsi'/>
-+  <flag name='cpu.migratable'/>
-+  <flag name='intel-iommu.aw-bits'/>
-+  <flag name='numa.hmat'/>
-+  <flag name='usb-host.hostdevice'/>
-+  <flag name='virtio-balloon.free-page-reporting'/>
-+  <flag name='block-export-add'/>
-+  <flag name='netdev.vhost-vdpa'/>
-+  <flag name='dc390'/>
-+  <flag name='am53c974'/>
-+  <flag name='virtio-pmem-pci'/>
-+  <flag name='vhost-user-fs.bootindex'/>
-+  <flag name='vhost-user-blk'/>
-+  <flag name='cpu-max'/>
-+  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-+  <flag name='migration-param.block-bitmap-mapping'/>
-+  <flag name='vnc-power-control'/>
-+  <flag name='object.qapified'/>
-+  <flag name='rotation-rate'/>
-+  <flag name='compat-deprecated'/>
-+  <flag name='acpi-index'/>
-+  <flag name='input-linux'/>
-+  <flag name='virtio-gpu-gl-pci'/>
-+  <flag name='virtio-vga-gl'/>
-+  <flag name='confidential-guest-support'/>
-+  <flag name='set-action'/>
-+  <flag name='virtio-blk.queue-size'/>
-+  <flag name='virtio-mem-pci'/>
-+  <flag name='memory-backend-file.reserve'/>
-+  <flag name='piix4.acpi-root-pci-hotplug'/>
-+  <flag name='netdev.json'/>
-+  <flag name='query-dirty-rate'/>
-+  <flag name='rbd-encryption'/>
-+  <flag name='sev-guest-kernel-hashes'/>
-+  <flag name='sev-inject-launch-secret'/>
-+  <flag name='device.json+hotplug'/>
-+  <flag name='virtio-mem-pci.prealloc'/>
-+  <flag name='calc-dirty-rate'/>
-+  <flag name='dirtyrate-param.mode'/>
-+  <flag name='blockdev.nbd.tls-hostname'/>
-+  <flag name='memory-backend-file.prealloc-threads'/>
-+  <flag name='virtio-iommu-pci'/>
-+  <flag name='virtio-iommu.boot-bypass'/>
-+  <flag name='virtio-net.rss'/>
-+  <flag name='chardev.qemu-vdagent'/>
-+  <flag name='display-dbus'/>
-+  <flag name='iothread.thread-pool-max'/>
-+  <flag name='usb-host.guest-resets-all'/>
-+  <flag name='migration.blocked-reasons'/>
-+  <flag name='query-stats'/>
-+  <flag name='query-stats-schemas'/>
-+  <flag name='thread-context'/>
-+  <flag name='screenshot-format-png'/>
-+  <flag name='machine-hpet'/>
-+  <flag name='netdev.stream'/>
-+  <flag name='virtio-crypto'/>
-+  <flag name='cryptodev-backend-lkcf'/>
-+  <flag name='pvpanic-pci'/>
-+  <flag name='netdev.stream.reconnect'/>
-+  <flag name='virtio-gpu.blob'/>
-+  <flag name='rbd-encryption-layering'/>
-+  <flag name='rbd-encryption-luks-any'/>
-+  <flag name='qcow2-discard-no-unref'/>
-+  <flag name='run-with.async-teardown'/>
-+  <flag name='virtio-blk-vhost-vdpa'/>
-+  <flag name='virtio-blk.iothread-mapping'/>
-+  <flag name='smp-clusters'/>
-+  <flag name='virtio-mem-pci.dynamic-memslots'/>
-+  <flag name='blockjob.backing-mask-protocol'/>
-+  <flag name='display-reload'/>
-+  <flag name='usb-mtp'/>
-+  <flag name='virtio-sound'/>
-+  <flag name='netdev.user'/>
-+  <flag name='acpi-erst'/>
-+  <flag name='intel-iommu.dma-translation'/>
-+  <flag name='machine-i8042-opt'/>
-+  <flag name='snapshot-internal-qmp'/>
-+  <flag name='chardev-reconnect-miliseconds'/>
-+  <flag name='netdev-stream-reconnect-miliseconds'/>
-+  <version>9002050</version>
-+  <microcodeVersion>43100285</microcodeVersion>
-+  <package>v9.2.0-1537-gd922088eb4</package>
-+  <arch>x86_64</arch>
-+  <hostCPU type='kvm' model='base' migratability='yes'>
-+    <property name='avx-ne-convert' type='boolean' value='false'/>
-+    <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>
-+    <property name='svme-addr-chk' type='boolean' value='true' migratable='yes'/>
-+    <property name='lfence-always-serializing' type='boolean' value='true' migratable='yes'/>
-+    <property name='cmov' type='boolean' value='true' migratable='yes'/>
-+    <property name='ia64' type='boolean' value='false'/>
-+    <property name='ssb-no' type='boolean' value='false'/>
-+    <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='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'/>
-+    <property name='gfni' type='boolean' value='false'/>
-+    <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'/>
-+    <property name='vmx-tsc-scaling' type='boolean' value='false'/>
-+    <property name='prefetchiti' type='boolean' value='false'/>
-+    <property name='vmx-cr8-store-exit' type='boolean' value='false'/>
-+    <property name='vmx-rdseed-exit' type='boolean' value='false'/>
-+    <property name='amx-fp16' type='boolean' value='false'/>
-+    <property name='fred' type='boolean' value='false'/>
-+    <property name='vmx-eptp-switching' type='boolean' value='false'/>
-+    <property name='ddpd-u' type='boolean' value='false'/>
-+    <property name='kvm-asyncpf' type='boolean' value='true' migratable='yes'/>
-+    <property name='perfctr-core' type='boolean' value='true' migratable='yes'/>
-+    <property name='mpx' type='boolean' value='false'/>
-+    <property name='auto-ibrs' type='boolean' value='false'/>
-+    <property name='pbe' type='boolean' value='false'/>
-+    <property name='avx512cd' type='boolean' value='false'/>
-+    <property name='decodeassists' type='boolean' value='false'/>
-+    <property name='vmx-exit-load-efer' type='boolean' value='false'/>
-+    <property name='vmx-exit-clear-bndcfgs' type='boolean' value='false'/>
-+    <property name='vmx-nested-exception' type='boolean' value='false'/>
-+    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-+    <property name='family' type='number' value='23'/>
-+    <property name='intel-pt-lip' type='boolean' value='false'/>
-+    <property name='vmx-vmwrite-vmexit-fields' type='boolean' value='false'/>
-+    <property name='kvm-asyncpf-int' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-vnmi' type='boolean' value='false'/>
-+    <property name='vmx-true-ctls' type='boolean' value='false'/>
-+    <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='true' migratable='yes'/>
-+    <property name='avx512f' type='boolean' value='false'/>
-+    <property name='rfds-no' type='boolean' value='true' migratable='yes'/>
-+    <property name='msr' type='boolean' value='true' migratable='yes'/>
-+    <property name='mce' type='boolean' value='true' migratable='yes'/>
-+    <property name='mca' type='boolean' value='true' migratable='yes'/>
-+    <property name='xcrypt' type='boolean' value='false'/>
-+    <property name='sgx' type='boolean' value='false'/>
-+    <property name='srso-user-kernel-no' type='boolean' value='false'/>
-+    <property name='vmx-exit-load-pat' type='boolean' value='false'/>
-+    <property name='vmx-intr-exit' type='boolean' value='false'/>
-+    <property name='min-level' type='number' value='16'/>
-+    <property name='vmx-flexpriority' type='boolean' value='false'/>
-+    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
-+    <property name='cid' type='boolean' value='false'/>
-+    <property name='sgx-exinfo' type='boolean' value='false'/>
-+    <property name='intel-psfd' type='boolean' value='false'/>
-+    <property name='amd-psfd' type='boolean' value='false'/>
-+    <property name='gds-no' type='boolean' value='true' migratable='yes'/>
-+    <property name='ds' type='boolean' value='false'/>
-+    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512-fp16' type='boolean' value='false'/>
-+    <property name='avx512-bf16' type='boolean' value='false'/>
-+    <property name='vmx-cr8-load-exit' type='boolean' value='false'/>
-+    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='arch-lbr' type='boolean' value='false'/>
-+    <property name='vmx-apicv-vid' type='boolean' value='false'/>
-+    <property name='vmx-exit-save-pat' type='boolean' value='false'/>
-+    <property name='xtpr' type='boolean' value='false'/>
-+    <property name='tsx-ctrl' type='boolean' value='false'/>
-+    <property name='vmx-ple' type='boolean' value='false'/>
-+    <property name='avx512vl' type='boolean' value='false'/>
-+    <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='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'/>
-+    <property name='sgx2' type='boolean' value='false'/>
-+    <property name='avx512vbmi2' type='boolean' value='false'/>
-+    <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-encls-exit' type='boolean' value='false'/>
-+    <property name='null-sel-clr-base' type='boolean' value='true' migratable='yes'/>
-+    <property name='stibp' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-msr-bitmap' type='boolean' value='false'/>
-+    <property name='xcrypt-en' type='boolean' value='false'/>
-+    <property name='vmx-mwait-exit' type='boolean' value='false'/>
-+    <property name='vmx-pml' type='boolean' value='false'/>
-+    <property name='vmx-nmi-exit' type='boolean' value='false'/>
-+    <property name='amx-tile' type='boolean' value='false'/>
-+    <property name='vmx-invept-single-context-noglobals' type='boolean' value='false'/>
-+    <property name='pn' type='boolean' value='false'/>
-+    <property name='rsba' type='boolean' value='false'/>
-+    <property name='dca' type='boolean' value='false'/>
-+    <property name='vendor' type='string' value='AuthenticAMD'/>
-+    <property name='vmx-unrestricted-guest' type='boolean' value='false'/>
-+    <property name='vmx-cr3-store-noexit' type='boolean' value='false'/>
-+    <property name='pku' type='boolean' value='false'/>
-+    <property name='pks' type='boolean' value='false'/>
-+    <property name='smx' type='boolean' value='false'/>
-+    <property name='sm3' type='boolean' value='false'/>
-+    <property name='sm4' type='boolean' value='false'/>
-+    <property name='cmp-legacy' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512-4fmaps' type='boolean' value='false'/>
-+    <property name='vmcb-clean' type='boolean' value='true' migratable='yes'/>
-+    <property name='hle' type='boolean' value='false'/>
-+    <property name='avx-vnni' type='boolean' value='false'/>
-+    <property name='3dnowext' type='boolean' value='false'/>
-+    <property name='amd-no-ssb' type='boolean' value='false'/>
-+    <property name='npt' type='boolean' value='true' migratable='yes'/>
-+    <property name='sgxlc' type='boolean' value='false'/>
-+    <property name='perfmon-v2' type='boolean' value='false'/>
-+    <property name='rdctl-no' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-invvpid' type='boolean' value='false'/>
-+    <property name='clwb' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx10-128' type='boolean' value='false'/>
-+    <property name='lbrv' type='boolean' value='true' migratable='yes'/>
-+    <property name='adx' type='boolean' value='true' migratable='yes'/>
-+    <property name='ss' type='boolean' value='false'/>
-+    <property name='pni' type='boolean' value='true' migratable='yes'/>
-+    <property name='tsx-ldtrk' type='boolean' value='false'/>
-+    <property name='ibpb-brtype' type='boolean' value='true' migratable='yes'/>
-+    <property name='svm-lock' type='boolean' value='false'/>
-+    <property name='smep' type='boolean' value='true' migratable='yes'/>
-+    <property name='smap' type='boolean' value='true' migratable='yes'/>
-+    <property name='pfthreshold' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-invpcid-exit' type='boolean' value='false'/>
-+    <property name='amx-int8' type='boolean' value='false'/>
-+    <property name='x2apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512vbmi' type='boolean' value='false'/>
-+    <property name='avx512vnni' type='boolean' value='false'/>
-+    <property name='sgx-edeccssa' type='boolean' value='false'/>
-+    <property name='vmx-apicv-x2apic' type='boolean' value='false'/>
-+    <property name='kvm-pv-sched-yield' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-invlpg-exit' type='boolean' value='false'/>
-+    <property name='no-nested-data-bp' type='boolean' value='false'/>
-+    <property name='vmx-invvpid-all-context' type='boolean' value='false'/>
-+    <property name='vmx-activity-hlt' type='boolean' value='false'/>
-+    <property name='flushbyasid' type='boolean' value='true' migratable='yes'/>
-+    <property name='f16c' type='boolean' value='true' migratable='yes'/>
-+    <property name='fdp-excptn-only' type='boolean' value='false'/>
-+    <property name='vmx-exit-ack-intr' type='boolean' value='false'/>
-+    <property name='ace2-en' type='boolean' value='false'/>
-+    <property name='pae' type='boolean' value='true' migratable='yes'/>
-+    <property name='pat' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse' type='boolean' value='true' migratable='yes'/>
-+    <property name='phe-en' type='boolean' value='false'/>
-+    <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'/>
-+    <property name='vmx-rdtscp-exit' type='boolean' value='false'/>
-+    <property name='mds-no' type='boolean' value='true' migratable='yes'/>
-+    <property name='pcommit' type='boolean' value='false'/>
-+    <property name='vmx-vpid' type='boolean' value='false'/>
-+    <property name='syscall' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-asyncpf-vmexit' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512dq' type='boolean' value='false'/>
-+    <property name='svm' type='boolean' value='true' migratable='yes'/>
-+    <property name='invtsc' type='boolean' value='true' migratable='no'/>
-+    <property name='vmx-monitor-exit' type='boolean' value='false'/>
-+    <property name='sse2' type='boolean' value='true' migratable='yes'/>
-+    <property name='ssbd' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-wbinvd-exit' type='boolean' value='false'/>
-+    <property name='est' type='boolean' value='false'/>
-+    <property name='kvm-poll-control' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512ifma' type='boolean' value='false'/>
-+    <property name='tm2' type='boolean' value='false'/>
-+    <property name='zero-fcs-fds' type='boolean' value='false'/>
-+    <property name='kvm-pv-eoi' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-pv-ipi' type='boolean' value='true' migratable='yes'/>
-+    <property name='cx8' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-invvpid-single-addr' type='boolean' value='false'/>
-+    <property name='waitpkg' type='boolean' value='false'/>
-+    <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='lkgs' type='boolean' value='false'/>
-+    <property name='kvm-mmu' type='boolean' value='false'/>
-+    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-+    <property name='pge' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512bitalg' type='boolean' value='false'/>
-+    <property name='pdcm' type='boolean' value='false'/>
-+    <property name='vmx-entry-load-bndcfgs' type='boolean' value='false'/>
-+    <property name='vmx-exit-clear-rtit-ctl' type='boolean' value='false'/>
-+    <property name='stibp-always-on' type='boolean' value='false'/>
-+    <property name='model' type='number' value='113'/>
-+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-+    <property name='nrip-save' type='boolean' value='true' migratable='yes'/>
-+    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4a' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-msi-ext-dest-id' type='boolean' value='false'/>
-+    <property name='vmx-pause-exit' type='boolean' value='false'/>
-+    <property name='invpcid' type='boolean' value='false'/>
-+    <property name='sgx-debug' type='boolean' value='false'/>
-+    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
-+    <property name='sgx-mode64' type='boolean' value='false'/>
-+    <property name='tsc-deadline' type='boolean' value='true' migratable='yes'/>
-+    <property name='skip-l1dfl-vmentry' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-exit-load-perf-global-ctrl' type='boolean' value='false'/>
-+    <property name='fma' type='boolean' value='true' migratable='yes'/>
-+    <property name='lam' type='boolean' value='false'/>
-+    <property name='cx16' type='boolean' value='true' migratable='yes'/>
-+    <property name='de' type='boolean' value='true' migratable='yes'/>
-+    <property name='fzrm' type='boolean' value='false'/>
-+    <property name='avx-ifma' type='boolean' value='false'/>
-+    <property name='stepping' type='number' value='0'/>
-+    <property name='xsave' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-entry-load-fred' type='boolean' value='false'/>
-+    <property name='clflush' type='boolean' value='true' migratable='yes'/>
-+    <property name='skinit' type='boolean' value='false'/>
-+    <property name='srso-no' type='boolean' value='false'/>
-+    <property name='avx-vnni-int8' type='boolean' value='false'/>
-+    <property name='vmx-exit-secondary-ctls' type='boolean' value='false'/>
-+    <property name='tsc' type='boolean' value='true' migratable='yes'/>
-+    <property name='tce' type='boolean' value='false'/>
-+    <property name='flush-l1d' type='boolean' value='false'/>
-+    <property name='fpu' type='boolean' value='true' migratable='yes'/>
-+    <property name='ds-cpl' type='boolean' value='false'/>
-+    <property name='ibs' type='boolean' value='false'/>
-+    <property name='fma4' type='boolean' value='false'/>
-+    <property name='vmx-exit-nosave-debugctl' type='boolean' value='false'/>
-+    <property name='sgx-kss' type='boolean' value='false'/>
-+    <property name='la57' type='boolean' value='false'/>
-+    <property name='vmx-invept' type='boolean' value='false'/>
-+    <property name='osvw' type='boolean' value='true' migratable='yes'/>
-+    <property name='rfds-clear' type='boolean' value='false'/>
-+    <property name='succor' type='boolean' value='true' migratable='yes'/>
-+    <property name='apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='pmm' type='boolean' value='false'/>
-+    <property name='vmx-entry-noload-debugctl' type='boolean' value='false'/>
-+    <property name='vmx-eptad' type='boolean' value='false'/>
-+    <property name='spec-ctrl' type='boolean' value='false'/>
-+    <property name='vmx-posted-intr' type='boolean' value='false'/>
-+    <property name='vmx-apicv-register' type='boolean' value='false'/>
-+    <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='vmx-any-errcode' 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'/>
-+    <property name='amx-complex' type='boolean' value='false'/>
-+    <property name='avx-vnni-int16' type='boolean' value='false'/>
-+    <property name='pschange-mc-no' type='boolean' value='true' migratable='yes'/>
-+    <property name='v-vmsave-vmload' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-rdrand-exit' type='boolean' value='false'/>
-+    <property name='sgx-provisionkey' type='boolean' value='false'/>
-+    <property name='lwp' type='boolean' value='false'/>
-+    <property name='ipred-ctrl' type='boolean' value='false'/>
-+    <property name='amd-ssbd' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx10-256' type='boolean' value='false'/>
-+    <property name='xop' type='boolean' value='false'/>
-+    <property name='ibpb' type='boolean' value='true' migratable='yes'/>
-+    <property name='ibrs' type='boolean' value='false'/>
-+    <property name='avx' type='boolean' value='true' migratable='yes'/>
-+    <property name='core-capability' type='boolean' value='false'/>
-+    <property name='vmx-invept-single-context' type='boolean' value='false'/>
-+    <property name='movdiri' type='boolean' value='false'/>
-+    <property name='acpi' type='boolean' value='false'/>
-+    <property name='avx512bw' type='boolean' value='false'/>
-+    <property name='ace2' type='boolean' value='false'/>
-+    <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-ept-2mb' type='boolean' value='false'/>
-+    <property name='vmx-ept-1gb' type='boolean' value='false'/>
-+    <property name='ht' type='boolean' value='false'/>
-+    <property name='vmx-io-exit' type='boolean' value='false'/>
-+    <property name='nx' type='boolean' value='true' migratable='yes'/>
-+    <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
-+    <property name='mmxext' type='boolean' value='true' migratable='yes'/>
-+    <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-+    <property name='vaes' type='boolean' value='false'/>
-+    <property name='serialize' type='boolean' value='false'/>
-+    <property name='movdir64b' type='boolean' value='false'/>
-+    <property name='xsaves' type='boolean' value='false'/>
-+    <property name='vmx-shadow-vmcs' type='boolean' value='false'/>
-+    <property name='lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-exit-save-preemption-timer' type='boolean' value='false'/>
-+    <property name='vmx-entry-load-pat' type='boolean' value='false'/>
-+    <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'/>
-+    <property name='vmx-store-lma' type='boolean' value='false'/>
-+    <property name='vmx-movdr-exit' type='boolean' value='false'/>
-+    <property name='pse' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx2' type='boolean' value='true' migratable='yes'/>
-+    <property name='avic' type='boolean' value='false'/>
-+    <property name='sep' type='boolean' value='true' migratable='yes'/>
-+    <property name='virt-ssbd' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-cr3-load-noexit' type='boolean' value='false'/>
-+    <property name='nodeid-msr' type='boolean' value='false'/>
-+    <property name='md-clear' type='boolean' value='false'/>
-+    <property name='sbpb' type='boolean' value='false'/>
-+    <property name='misalignsse' type='boolean' value='true' migratable='yes'/>
-+    <property name='split-lock-detect' type='boolean' value='false'/>
-+    <property name='min-xlevel' type='number' value='2147483681'/>
-+    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
-+    <property name='tsc-scale' type='boolean' value='true' migratable='yes'/>
-+    <property name='topoext' type='boolean' value='false'/>
-+    <property name='amd-stibp' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-preemption-timer' type='boolean' value='false'/>
-+    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-entry-load-pkrs' type='boolean' value='false'/>
-+    <property name='avx10-512' type='boolean' value='false'/>
-+    <property name='vmx-vnmi-pending' type='boolean' value='false'/>
-+    <property name='monitor' type='boolean' value='false'/>
-+    <property name='vmx-vintr-pending' type='boolean' value='false'/>
-+    <property name='avx512er' type='boolean' value='false'/>
-+    <property name='full-width-write' type='boolean' value='false'/>
-+    <property name='pmm-en' type='boolean' value='false'/>
-+    <property name='pcid' type='boolean' value='false'/>
-+    <property name='taa-no' type='boolean' value='false'/>
-+    <property name='avx10' type='boolean' value='false'/>
-+    <property name='arch-capabilities' type='boolean' value='true' migratable='yes'/>
-+    <property name='vgif' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-secondary-ctls' type='boolean' value='false'/>
-+    <property name='vmx-xsaves' type='boolean' value='false'/>
-+    <property name='clzero' type='boolean' value='true' migratable='yes'/>
-+    <property name='3dnow' type='boolean' value='false'/>
-+    <property name='erms' type='boolean' value='false'/>
-+    <property name='vmx-entry-ia32e-mode' type='boolean' value='false'/>
-+    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='overflow-recov' type='boolean' value='true' migratable='yes'/>
-+    <property name='vpclmulqdq' type='boolean' value='false'/>
-+    <property name='vmx-ins-outs' type='boolean' value='false'/>
-+    <property name='fxsr-opt' type='boolean' value='true' migratable='yes'/>
-+    <property name='xstore' type='boolean' value='false'/>
-+    <property name='rtm' type='boolean' value='false'/>
-+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
-+    <property name='sgx-aex-notify' type='boolean' value='false'/>
-+    <property name='bhi-ctrl' type='boolean' value='false'/>
-+    <property name='amx-bf16' type='boolean' value='false'/>
-+    <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='true' migratable='yes'/>
-+    <property name='cmpccxadd' type='boolean' value='false'/>
-+    <property name='bhi-no' type='boolean' value='false'/>
-+    <property name='avx512-4vnniw' type='boolean' value='false'/>
-+    <property name='vme' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx' type='boolean' value='false'/>
-+    <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='true' migratable='yes'/>
-+    <property name='pse36' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-activity-wait-sipi' type='boolean' value='false'/>
-+    <property name='tbm' type='boolean' value='false'/>
-+    <property name='wdt' type='boolean' value='false'/>
-+    <property name='vmx-rdpmc-exit' type='boolean' value='false'/>
-+    <property name='vmx-mtf' type='boolean' value='false'/>
-+    <property name='vmx-entry-load-efer' type='boolean' value='false'/>
-+    <property name='eraps' type='boolean' value='false'/>
-+    <property name='wrmsrns' type='boolean' value='false'/>
-+    <property name='model-id' type='string' value='AMD Ryzen 9 3900X 12-Core Processor            '/>
-+    <property name='sha-ni' type='boolean' value='true' migratable='yes'/>
-+    <property name='rrsba-ctrl' type='boolean' value='false'/>
-+    <property name='fb-clear' type='boolean' value='false'/>
-+    <property name='vmx-exit-load-pkrs' type='boolean' value='false'/>
-+    <property name='abm' type='boolean' value='true' migratable='yes'/>
-+    <property name='sha512' type='boolean' value='false'/>
-+    <property name='vmx-ept-advanced-exitinfo' type='boolean' value='false'/>
-+    <property name='vmx-enable-user-wait-pause' type='boolean' value='false'/>
-+    <property name='avx512pf' type='boolean' value='false'/>
-+    <property name='vmx-hlt-exit' type='boolean' value='false'/>
-+    <property name='xstore-en' type='boolean' value='false'/>
-+  </hostCPU>
-+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='qemu64-v1' typename='qemu64-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='qemu32-v1' typename='qemu32-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='phenom-v1' typename='phenom-v1-x86_64-cpu' usable='no'>
-+    <blocker name='3dnowext'/>
-+    <blocker name='3dnow'/>
-+  </cpu>
-+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
-+    <blocker name='3dnowext'/>
-+    <blocker name='3dnow'/>
-+  </cpu>
-+  <cpu type='kvm' name='pentium3-v1' typename='pentium3-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='pentium2-v1' typename='pentium2-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='pentium-v1' typename='pentium-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='n270-v1' typename='n270-v1-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+  </cpu>
-+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+  </cpu>
-+  <cpu type='kvm' name='kvm64-v1' typename='kvm64-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='kvm32-v1' typename='kvm32-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='coreduo-v1' typename='coreduo-v1-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+  </cpu>
-+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+  </cpu>
-+  <cpu type='kvm' name='core2duo-v1' typename='core2duo-v1-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+  </cpu>
-+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+  </cpu>
-+  <cpu type='kvm' name='athlon-v1' typename='athlon-v1-x86_64-cpu' usable='no'>
-+    <blocker name='3dnowext'/>
-+    <blocker name='3dnow'/>
-+  </cpu>
-+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
-+    <blocker name='3dnowext'/>
-+    <blocker name='3dnow'/>
-+  </cpu>
-+  <cpu type='kvm' name='Westmere-v2' typename='Westmere-v2-x86_64-cpu' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Westmere-v1' typename='Westmere-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Snowridge-v4' typename='Snowridge-v4-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+    <blocker name='gfni'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='Snowridge-v3' typename='Snowridge-v3-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+    <blocker name='gfni'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='core-capability'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='split-lock-detect'/>
-+  </cpu>
-+  <cpu type='kvm' name='Snowridge-v2' typename='Snowridge-v2-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+    <blocker name='gfni'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='core-capability'/>
-+    <blocker name='split-lock-detect'/>
-+  </cpu>
-+  <cpu type='kvm' name='Snowridge-v1' typename='Snowridge-v1-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+    <blocker name='mpx'/>
-+    <blocker name='gfni'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='core-capability'/>
-+    <blocker name='split-lock-detect'/>
-+  </cpu>
-+  <cpu type='kvm' name='Snowridge' typename='Snowridge-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+    <blocker name='mpx'/>
-+    <blocker name='gfni'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='core-capability'/>
-+    <blocker name='split-lock-detect'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Server-v5' typename='Skylake-Server-v5-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Server-v4' typename='Skylake-Server-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Server-v3' typename='Skylake-Server-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Server-v2' typename='Skylake-Server-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='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Server-v1' typename='Skylake-Server-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='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Server-noTSX-IBRS' typename='Skylake-Server-noTSX-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-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='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-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='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Client-v4' typename='Skylake-Client-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Client-v3' typename='Skylake-Client-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Client-v2' typename='Skylake-Client-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Client-v1' typename='Skylake-Client-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Client-noTSX-IBRS' typename='Skylake-Client-noTSX-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </cpu>
-+  <cpu type='kvm' name='SierraForest-v2' typename='SierraForest-v2-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='pku'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vaes'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='fsrm'/>
-+    <blocker name='serialize'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='avx-vnni'/>
-+    <blocker name='cmpccxadd'/>
-+    <blocker name='fsrs'/>
-+    <blocker name='avx-ifma'/>
-+    <blocker name='lam'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='sbdr-ssdp-no'/>
-+    <blocker name='fbsdp-no'/>
-+    <blocker name='psdp-no'/>
-+    <blocker name='pbrsb-no'/>
-+    <blocker name='avx-vnni-int8'/>
-+    <blocker name='avx-ne-convert'/>
-+    <blocker name='intel-psfd'/>
-+    <blocker name='ipred-ctrl'/>
-+    <blocker name='rrsba-ctrl'/>
-+    <blocker name='bhi-ctrl'/>
-+    <blocker name='mcdt-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='SierraForest-v1' typename='SierraForest-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='pku'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vaes'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='fsrm'/>
-+    <blocker name='serialize'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='avx-vnni'/>
-+    <blocker name='cmpccxadd'/>
-+    <blocker name='fsrs'/>
-+    <blocker name='avx-ifma'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='sbdr-ssdp-no'/>
-+    <blocker name='fbsdp-no'/>
-+    <blocker name='psdp-no'/>
-+    <blocker name='pbrsb-no'/>
-+    <blocker name='avx-vnni-int8'/>
-+    <blocker name='avx-ne-convert'/>
-+    <blocker name='mcdt-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='SierraForest' typename='SierraForest-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='pku'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vaes'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='fsrm'/>
-+    <blocker name='serialize'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='avx-vnni'/>
-+    <blocker name='cmpccxadd'/>
-+    <blocker name='fsrs'/>
-+    <blocker name='avx-ifma'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='sbdr-ssdp-no'/>
-+    <blocker name='fbsdp-no'/>
-+    <blocker name='psdp-no'/>
-+    <blocker name='pbrsb-no'/>
-+    <blocker name='avx-vnni-int8'/>
-+    <blocker name='avx-ne-convert'/>
-+    <blocker name='mcdt-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='SapphireRapids-v3' typename='SapphireRapids-v3-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+    <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='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <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='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-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='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'/>
-+    <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='ibrs-all'/>
-+    <blocker name='taa-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='SapphireRapids' typename='SapphireRapids-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='ibrs-all'/>
-+    <blocker name='taa-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='SandyBridge-v2' typename='SandyBridge-v2-x86_64-cpu' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='SandyBridge-v1' typename='SandyBridge-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Penryn-v1' typename='Penryn-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G5-v1' typename='Opteron_G5-v1-x86_64-cpu' usable='no'>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+    <blocker name='tbm'/>
-+  </cpu>
-+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+    <blocker name='tbm'/>
-+  </cpu>
-+  <cpu type='kvm' name='Opteron_G4-v1' typename='Opteron_G4-v1-x86_64-cpu' usable='no'>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+  </cpu>
-+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+  </cpu>
-+  <cpu type='kvm' name='Opteron_G3-v1' typename='Opteron_G3-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G2-v1' typename='Opteron_G2-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G1-v1' typename='Opteron_G1-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Nehalem-v2' typename='Nehalem-v2-x86_64-cpu' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Nehalem-v1' typename='Nehalem-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='KnightsMill-v1' typename='KnightsMill-v1-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+    <blocker name='erms'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512pf'/>
-+    <blocker name='avx512er'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512-vpopcntdq'/>
-+    <blocker name='avx512-4vnniw'/>
-+    <blocker name='avx512-4fmaps'/>
-+  </cpu>
-+  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+    <blocker name='erms'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512pf'/>
-+    <blocker name='avx512er'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512-vpopcntdq'/>
-+    <blocker name='avx512-4vnniw'/>
-+    <blocker name='avx512-4fmaps'/>
-+  </cpu>
-+  <cpu type='kvm' name='IvyBridge-v2' typename='IvyBridge-v2-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='IvyBridge-v1' typename='IvyBridge-v1-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+  </cpu>
-+  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+  </cpu>
-+  <cpu type='kvm' name='Icelake-Server-v7' typename='Icelake-Server-v7-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='fsrm'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='taa-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='Icelake-Server-v6' typename='Icelake-Server-v6-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <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='fsrm'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='taa-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='Icelake-Server-v5' typename='Icelake-Server-v5-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <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='fsrm'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='taa-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='Icelake-Server-v4' typename='Icelake-Server-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <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='fsrm'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='taa-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='Icelake-Server-v3' typename='Icelake-Server-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <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='spec-ctrl'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='taa-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='Icelake-Server-v2' typename='Icelake-Server-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <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='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Icelake-Server-v1' typename='Icelake-Server-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='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='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Icelake-Server-noTSX' typename='Icelake-Server-noTSX-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <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='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Icelake-Server' typename='Icelake-Server-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='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='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Haswell-v4' typename='Haswell-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Haswell-v3' typename='Haswell-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Haswell-v2' typename='Haswell-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+  </cpu>
-+  <cpu type='kvm' name='Haswell-v1' typename='Haswell-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </cpu>
-+  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+  </cpu>
-+  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </cpu>
-+  <cpu type='kvm' name='GraniteRapids-v2' typename='GraniteRapids-v2-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+    <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='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <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='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='avx10'/>
-+    <blocker name='mcdt-no'/>
-+    <blocker name='avx10-128'/>
-+    <blocker name='avx10-256'/>
-+    <blocker name='avx10-512'/>
-+  </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='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='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>
-+  <cpu type='kvm' name='EPYC-v3' typename='EPYC-v3-x86_64-cpu' usable='no'>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC-v2' typename='EPYC-v2-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='EPYC-v1' typename='EPYC-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='EPYC-Rome-v4' typename='EPYC-Rome-v4-x86_64-cpu' usable='no'>
-+    <blocker name='ibrs'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC-Rome-v3' typename='EPYC-Rome-v3-x86_64-cpu' usable='no'>
-+    <blocker name='ibrs'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC-Rome-v2' typename='EPYC-Rome-v2-x86_64-cpu' usable='no'>
-+    <blocker name='ibrs'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC-Rome-v1' typename='EPYC-Rome-v1-x86_64-cpu' usable='no'>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC-Rome' typename='EPYC-Rome-x86_64-cpu' usable='no'>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC-Milan-v2' typename='EPYC-Milan-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='pku'/>
-+    <blocker name='vaes'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='fsrm'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='stibp-always-on'/>
-+    <blocker name='amd-psfd'/>
-+    <blocker name='no-nested-data-bp'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC-Milan-v1' typename='EPYC-Milan-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='pku'/>
-+    <blocker name='fsrm'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC-Milan' typename='EPYC-Milan-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='pku'/>
-+    <blocker name='fsrm'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='EPYC-Genoa-v1' typename='EPYC-Genoa-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <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='fsrm'/>
-+    <blocker name='avx512-bf16'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='stibp-always-on'/>
-+    <blocker name='amd-psfd'/>
-+    <blocker name='no-nested-data-bp'/>
-+    <blocker name='auto-ibrs'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC-Genoa' typename='EPYC-Genoa-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <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='fsrm'/>
-+    <blocker name='avx512-bf16'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='stibp-always-on'/>
-+    <blocker name='amd-psfd'/>
-+    <blocker name='no-nested-data-bp'/>
-+    <blocker name='auto-ibrs'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Dhyana-v2' typename='Dhyana-v2-x86_64-cpu' usable='no'>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='Dhyana-v1' typename='Dhyana-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Dhyana' typename='Dhyana-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Denverton-v3' typename='Denverton-v3-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='kvm' name='Denverton-v2' typename='Denverton-v2-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Denverton-v1' typename='Denverton-v1-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+    <blocker name='mpx'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Denverton' typename='Denverton-x86_64-cpu' usable='no'>
-+    <blocker name='erms'/>
-+    <blocker name='mpx'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Cooperlake-v2' typename='Cooperlake-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='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='avx512-bf16'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='taa-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='Cooperlake-v1' typename='Cooperlake-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='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='avx512-bf16'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='taa-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='Cooperlake' typename='Cooperlake-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='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='avx512-bf16'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='taa-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='Conroe-v1' typename='Conroe-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='ClearwaterForest-v1' typename='ClearwaterForest-v1-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='pku'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vaes'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='fsrm'/>
-+    <blocker name='serialize'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='sha512'/>
-+    <blocker name='sm3'/>
-+    <blocker name='sm4'/>
-+    <blocker name='avx-vnni'/>
-+    <blocker name='cmpccxadd'/>
-+    <blocker name='fsrs'/>
-+    <blocker name='avx-ifma'/>
-+    <blocker name='lam'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='sbdr-ssdp-no'/>
-+    <blocker name='fbsdp-no'/>
-+    <blocker name='psdp-no'/>
-+    <blocker name='bhi-no'/>
-+    <blocker name='pbrsb-no'/>
-+    <blocker name='avx-vnni-int8'/>
-+    <blocker name='avx-ne-convert'/>
-+    <blocker name='avx-vnni-int16'/>
-+    <blocker name='prefetchiti'/>
-+    <blocker name='intel-psfd'/>
-+    <blocker name='ipred-ctrl'/>
-+    <blocker name='rrsba-ctrl'/>
-+    <blocker name='ddpd-u'/>
-+    <blocker name='bhi-ctrl'/>
-+    <blocker name='mcdt-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='ClearwaterForest' typename='ClearwaterForest-x86_64-cpu' usable='no'>
-+    <blocker name='ss'/>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='pku'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vaes'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='fsrm'/>
-+    <blocker name='serialize'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='sha512'/>
-+    <blocker name='sm3'/>
-+    <blocker name='sm4'/>
-+    <blocker name='avx-vnni'/>
-+    <blocker name='cmpccxadd'/>
-+    <blocker name='fsrs'/>
-+    <blocker name='avx-ifma'/>
-+    <blocker name='lam'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='ibrs-all'/>
-+    <blocker name='sbdr-ssdp-no'/>
-+    <blocker name='fbsdp-no'/>
-+    <blocker name='psdp-no'/>
-+    <blocker name='bhi-no'/>
-+    <blocker name='pbrsb-no'/>
-+    <blocker name='avx-vnni-int8'/>
-+    <blocker name='avx-ne-convert'/>
-+    <blocker name='avx-vnni-int16'/>
-+    <blocker name='prefetchiti'/>
-+    <blocker name='intel-psfd'/>
-+    <blocker name='ipred-ctrl'/>
-+    <blocker name='rrsba-ctrl'/>
-+    <blocker name='ddpd-u'/>
-+    <blocker name='bhi-ctrl'/>
-+    <blocker name='mcdt-no'/>
-+  </cpu>
-+  <cpu type='kvm' name='Cascadelake-Server-v5' typename='Cascadelake-Server-v5-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='ibrs-all'/>
-+  </cpu>
-+  <cpu type='kvm' name='Cascadelake-Server-v4' typename='Cascadelake-Server-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='ibrs-all'/>
-+  </cpu>
-+  <cpu type='kvm' name='Cascadelake-Server-v3' typename='Cascadelake-Server-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='ibrs-all'/>
-+  </cpu>
-+  <cpu type='kvm' name='Cascadelake-Server-v2' typename='Cascadelake-Server-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='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='ibrs-all'/>
-+  </cpu>
-+  <cpu type='kvm' name='Cascadelake-Server-v1' typename='Cascadelake-Server-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='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Cascadelake-Server-noTSX' typename='Cascadelake-Server-noTSX-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='ibrs-all'/>
-+  </cpu>
-+  <cpu type='kvm' name='Cascadelake-Server' typename='Cascadelake-Server-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='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Broadwell-v4' typename='Broadwell-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Broadwell-v3' typename='Broadwell-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Broadwell-v2' typename='Broadwell-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+  </cpu>
-+  <cpu type='kvm' name='Broadwell-v1' typename='Broadwell-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </cpu>
-+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+  </cpu>
-+  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='hle'/>
-+    <blocker name='erms'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </cpu>
-+  <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
-+  <machine type='kvm' name='pc-i440fx-10.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-5.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-9.1' hotplugCpus='yes' maxCpus='4096' defaultCPU='qemu64-x86_64-cpu' 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-q35-8.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-8.1' hotplugCpus='yes' maxCpus='255' 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' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-9.1' hotplugCpus='yes' maxCpus='255' 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' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-10.0' alias='q35' hotplugCpus='yes' maxCpus='4096' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-7.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='x-remote' maxCpus='1' acpi='no'/>
-+  <machine type='kvm' name='pc-q35-5.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-6.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-5.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-9.0' hotplugCpus='yes' maxCpus='4096' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-7.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-8.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-8.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-6.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-9.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-7.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-5.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-9.2' hotplugCpus='yes' maxCpus='4096' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-7.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-8.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-8.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-5.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-6.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-9.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='kvm' name='pc-i440fx-7.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <hostCPU type='tcg' model='base' migratability='yes'>
-+    <property name='avx-ne-convert' type='boolean' value='false'/>
-+    <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>
-+    <property name='svme-addr-chk' type='boolean' value='true' migratable='yes'/>
-+    <property name='lfence-always-serializing' type='boolean' value='false'/>
-+    <property name='cmov' type='boolean' value='true' migratable='yes'/>
-+    <property name='ia64' type='boolean' value='false'/>
-+    <property name='ssb-no' type='boolean' value='false'/>
-+    <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='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'/>
-+    <property name='gfni' type='boolean' value='false'/>
-+    <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'/>
-+    <property name='vmx-tsc-scaling' type='boolean' value='false'/>
-+    <property name='prefetchiti' type='boolean' value='false'/>
-+    <property name='vmx-cr8-store-exit' type='boolean' value='false'/>
-+    <property name='vmx-rdseed-exit' type='boolean' value='false'/>
-+    <property name='amx-fp16' type='boolean' value='false'/>
-+    <property name='fred' type='boolean' value='false'/>
-+    <property name='vmx-eptp-switching' type='boolean' value='false'/>
-+    <property name='ddpd-u' type='boolean' value='false'/>
-+    <property name='kvm-asyncpf' type='boolean' value='false'/>
-+    <property name='perfctr-core' type='boolean' value='false'/>
-+    <property name='mpx' type='boolean' value='true' migratable='yes'/>
-+    <property name='auto-ibrs' type='boolean' value='false'/>
-+    <property name='pbe' type='boolean' value='false'/>
-+    <property name='avx512cd' type='boolean' value='false'/>
-+    <property name='decodeassists' type='boolean' value='false'/>
-+    <property name='vmx-exit-load-efer' type='boolean' value='false'/>
-+    <property name='vmx-exit-clear-bndcfgs' type='boolean' value='false'/>
-+    <property name='vmx-nested-exception' type='boolean' value='false'/>
-+    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-+    <property name='family' type='number' value='0'/>
-+    <property name='intel-pt-lip' type='boolean' value='false'/>
-+    <property name='vmx-vmwrite-vmexit-fields' type='boolean' value='false'/>
-+    <property name='kvm-asyncpf-int' type='boolean' value='false'/>
-+    <property name='vmx-vnmi' type='boolean' value='false'/>
-+    <property name='vmx-true-ctls' type='boolean' value='false'/>
-+    <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='true' migratable='yes'/>
-+    <property name='avx512f' type='boolean' value='false'/>
-+    <property name='rfds-no' type='boolean' value='false'/>
-+    <property name='msr' type='boolean' value='true' migratable='yes'/>
-+    <property name='mce' type='boolean' value='true' migratable='yes'/>
-+    <property name='mca' type='boolean' value='true' migratable='yes'/>
-+    <property name='xcrypt' type='boolean' value='false'/>
-+    <property name='sgx' type='boolean' value='false'/>
-+    <property name='srso-user-kernel-no' type='boolean' value='false'/>
-+    <property name='vmx-exit-load-pat' type='boolean' value='false'/>
-+    <property name='vmx-intr-exit' type='boolean' value='false'/>
-+    <property name='min-level' type='number' value='13'/>
-+    <property name='vmx-flexpriority' type='boolean' value='false'/>
-+    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
-+    <property name='cid' type='boolean' value='false'/>
-+    <property name='sgx-exinfo' type='boolean' value='false'/>
-+    <property name='intel-psfd' type='boolean' value='false'/>
-+    <property name='amd-psfd' type='boolean' value='false'/>
-+    <property name='gds-no' type='boolean' value='false'/>
-+    <property name='ds' type='boolean' value='false'/>
-+    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512-fp16' type='boolean' value='false'/>
-+    <property name='avx512-bf16' type='boolean' value='false'/>
-+    <property name='vmx-cr8-load-exit' type='boolean' value='false'/>
-+    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='arch-lbr' type='boolean' value='false'/>
-+    <property name='vmx-apicv-vid' type='boolean' value='false'/>
-+    <property name='vmx-exit-save-pat' type='boolean' value='false'/>
-+    <property name='xtpr' type='boolean' value='false'/>
-+    <property name='tsx-ctrl' type='boolean' value='false'/>
-+    <property name='vmx-ple' type='boolean' value='false'/>
-+    <property name='avx512vl' type='boolean' value='false'/>
-+    <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='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'/>
-+    <property name='sgx2' type='boolean' value='false'/>
-+    <property name='avx512vbmi2' type='boolean' value='false'/>
-+    <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-encls-exit' type='boolean' value='false'/>
-+    <property name='null-sel-clr-base' type='boolean' value='false'/>
-+    <property name='stibp' type='boolean' value='false'/>
-+    <property name='vmx-msr-bitmap' type='boolean' value='false'/>
-+    <property name='xcrypt-en' type='boolean' value='false'/>
-+    <property name='vmx-mwait-exit' type='boolean' value='false'/>
-+    <property name='vmx-pml' type='boolean' value='false'/>
-+    <property name='vmx-nmi-exit' type='boolean' value='false'/>
-+    <property name='amx-tile' type='boolean' value='false'/>
-+    <property name='vmx-invept-single-context-noglobals' type='boolean' value='false'/>
-+    <property name='pn' type='boolean' value='false'/>
-+    <property name='rsba' type='boolean' value='false'/>
-+    <property name='dca' type='boolean' value='false'/>
-+    <property name='vendor' type='string' value='AuthenticAMD'/>
-+    <property name='vmx-unrestricted-guest' type='boolean' value='false'/>
-+    <property name='vmx-cr3-store-noexit' type='boolean' value='false'/>
-+    <property name='pku' type='boolean' value='true' migratable='yes'/>
-+    <property name='pks' type='boolean' value='true' migratable='yes'/>
-+    <property name='smx' type='boolean' value='false'/>
-+    <property name='sm3' type='boolean' value='false'/>
-+    <property name='sm4' type='boolean' value='false'/>
-+    <property name='cmp-legacy' type='boolean' value='false'/>
-+    <property name='avx512-4fmaps' type='boolean' value='false'/>
-+    <property name='vmcb-clean' type='boolean' value='false'/>
-+    <property name='hle' type='boolean' value='false'/>
-+    <property name='avx-vnni' type='boolean' value='false'/>
-+    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
-+    <property name='amd-no-ssb' type='boolean' value='false'/>
-+    <property name='npt' type='boolean' value='true' migratable='yes'/>
-+    <property name='sgxlc' type='boolean' value='false'/>
-+    <property name='perfmon-v2' type='boolean' value='false'/>
-+    <property name='rdctl-no' type='boolean' value='false'/>
-+    <property name='vmx-invvpid' type='boolean' value='false'/>
-+    <property name='clwb' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx10-128' type='boolean' value='false'/>
-+    <property name='lbrv' type='boolean' value='false'/>
-+    <property name='adx' type='boolean' value='true' migratable='yes'/>
-+    <property name='ss' type='boolean' value='true' migratable='yes'/>
-+    <property name='pni' type='boolean' value='true' migratable='yes'/>
-+    <property name='tsx-ldtrk' type='boolean' value='false'/>
-+    <property name='ibpb-brtype' type='boolean' value='false'/>
-+    <property name='svm-lock' type='boolean' value='false'/>
-+    <property name='smep' type='boolean' value='true' migratable='yes'/>
-+    <property name='smap' type='boolean' value='true' migratable='yes'/>
-+    <property name='pfthreshold' type='boolean' value='false'/>
-+    <property name='vmx-invpcid-exit' type='boolean' value='false'/>
-+    <property name='amx-int8' type='boolean' value='false'/>
-+    <property name='x2apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512vbmi' type='boolean' value='false'/>
-+    <property name='avx512vnni' type='boolean' value='false'/>
-+    <property name='sgx-edeccssa' type='boolean' value='false'/>
-+    <property name='vmx-apicv-x2apic' type='boolean' value='false'/>
-+    <property name='kvm-pv-sched-yield' type='boolean' value='false'/>
-+    <property name='vmx-invlpg-exit' type='boolean' value='false'/>
-+    <property name='no-nested-data-bp' type='boolean' value='false'/>
-+    <property name='vmx-invvpid-all-context' type='boolean' value='false'/>
-+    <property name='vmx-activity-hlt' type='boolean' value='false'/>
-+    <property name='flushbyasid' type='boolean' value='false'/>
-+    <property name='f16c' type='boolean' value='true' migratable='yes'/>
-+    <property name='fdp-excptn-only' type='boolean' value='false'/>
-+    <property name='vmx-exit-ack-intr' type='boolean' value='false'/>
-+    <property name='ace2-en' type='boolean' value='false'/>
-+    <property name='pae' type='boolean' value='true' migratable='yes'/>
-+    <property name='pat' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse' type='boolean' value='true' migratable='yes'/>
-+    <property name='phe-en' type='boolean' value='false'/>
-+    <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'/>
-+    <property name='vmx-rdtscp-exit' type='boolean' value='false'/>
-+    <property name='mds-no' type='boolean' value='false'/>
-+    <property name='pcommit' type='boolean' value='false'/>
-+    <property name='vmx-vpid' type='boolean' value='false'/>
-+    <property name='syscall' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-asyncpf-vmexit' type='boolean' value='false'/>
-+    <property name='avx512dq' type='boolean' value='false'/>
-+    <property name='svm' type='boolean' value='true' migratable='yes'/>
-+    <property name='invtsc' type='boolean' value='false'/>
-+    <property name='vmx-monitor-exit' type='boolean' value='false'/>
-+    <property name='sse2' type='boolean' value='true' migratable='yes'/>
-+    <property name='ssbd' type='boolean' value='false'/>
-+    <property name='vmx-wbinvd-exit' type='boolean' value='false'/>
-+    <property name='est' type='boolean' value='false'/>
-+    <property name='kvm-poll-control' type='boolean' value='false'/>
-+    <property name='avx512ifma' type='boolean' value='false'/>
-+    <property name='tm2' type='boolean' value='false'/>
-+    <property name='zero-fcs-fds' type='boolean' value='false'/>
-+    <property name='kvm-pv-eoi' type='boolean' value='false'/>
-+    <property name='kvm-pv-ipi' type='boolean' value='false'/>
-+    <property name='cx8' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-invvpid-single-addr' type='boolean' value='false'/>
-+    <property name='waitpkg' type='boolean' value='false'/>
-+    <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='lkgs' type='boolean' value='false'/>
-+    <property name='kvm-mmu' type='boolean' value='false'/>
-+    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-+    <property name='pge' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512bitalg' type='boolean' value='false'/>
-+    <property name='pdcm' type='boolean' value='false'/>
-+    <property name='vmx-entry-load-bndcfgs' type='boolean' value='false'/>
-+    <property name='vmx-exit-clear-rtit-ctl' type='boolean' value='false'/>
-+    <property name='stibp-always-on' type='boolean' value='false'/>
-+    <property name='model' type='number' value='0'/>
-+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-+    <property name='nrip-save' type='boolean' value='false'/>
-+    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4a' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-msi-ext-dest-id' type='boolean' value='false'/>
-+    <property name='vmx-pause-exit' type='boolean' value='false'/>
-+    <property name='invpcid' type='boolean' value='false'/>
-+    <property name='sgx-debug' type='boolean' value='false'/>
-+    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
-+    <property name='sgx-mode64' type='boolean' value='false'/>
-+    <property name='tsc-deadline' type='boolean' value='false'/>
-+    <property name='skip-l1dfl-vmentry' type='boolean' value='false'/>
-+    <property name='vmx-exit-load-perf-global-ctrl' type='boolean' value='false'/>
-+    <property name='fma' type='boolean' value='true' migratable='yes'/>
-+    <property name='lam' type='boolean' value='false'/>
-+    <property name='cx16' type='boolean' value='true' migratable='yes'/>
-+    <property name='de' type='boolean' value='true' migratable='yes'/>
-+    <property name='fzrm' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx-ifma' type='boolean' value='false'/>
-+    <property name='stepping' type='number' value='0'/>
-+    <property name='xsave' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-entry-load-fred' type='boolean' value='false'/>
-+    <property name='clflush' type='boolean' value='true' migratable='yes'/>
-+    <property name='skinit' type='boolean' value='false'/>
-+    <property name='srso-no' type='boolean' value='false'/>
-+    <property name='avx-vnni-int8' type='boolean' value='false'/>
-+    <property name='vmx-exit-secondary-ctls' type='boolean' value='false'/>
-+    <property name='tsc' type='boolean' value='true' migratable='yes'/>
-+    <property name='tce' type='boolean' value='false'/>
-+    <property name='flush-l1d' type='boolean' value='false'/>
-+    <property name='fpu' type='boolean' value='true' migratable='yes'/>
-+    <property name='ds-cpl' type='boolean' value='false'/>
-+    <property name='ibs' type='boolean' value='false'/>
-+    <property name='fma4' type='boolean' value='false'/>
-+    <property name='vmx-exit-nosave-debugctl' type='boolean' value='false'/>
-+    <property name='sgx-kss' type='boolean' value='false'/>
-+    <property name='la57' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-invept' type='boolean' value='false'/>
-+    <property name='osvw' type='boolean' value='false'/>
-+    <property name='rfds-clear' type='boolean' value='false'/>
-+    <property name='succor' type='boolean' value='false'/>
-+    <property name='apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='pmm' type='boolean' value='false'/>
-+    <property name='vmx-entry-noload-debugctl' type='boolean' value='false'/>
-+    <property name='vmx-eptad' type='boolean' value='false'/>
-+    <property name='spec-ctrl' type='boolean' value='false'/>
-+    <property name='vmx-posted-intr' type='boolean' value='false'/>
-+    <property name='vmx-apicv-register' type='boolean' value='false'/>
-+    <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='vmx-any-errcode' 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'/>
-+    <property name='amx-complex' type='boolean' value='false'/>
-+    <property name='avx-vnni-int16' type='boolean' value='false'/>
-+    <property name='pschange-mc-no' type='boolean' value='false'/>
-+    <property name='v-vmsave-vmload' type='boolean' value='false'/>
-+    <property name='vmx-rdrand-exit' type='boolean' value='false'/>
-+    <property name='sgx-provisionkey' type='boolean' value='false'/>
-+    <property name='lwp' type='boolean' value='false'/>
-+    <property name='ipred-ctrl' type='boolean' value='false'/>
-+    <property name='amd-ssbd' type='boolean' value='false'/>
-+    <property name='avx10-256' type='boolean' value='false'/>
-+    <property name='xop' type='boolean' value='false'/>
-+    <property name='ibpb' type='boolean' value='false'/>
-+    <property name='ibrs' type='boolean' value='false'/>
-+    <property name='avx' type='boolean' value='true' migratable='yes'/>
-+    <property name='core-capability' type='boolean' value='false'/>
-+    <property name='vmx-invept-single-context' type='boolean' value='false'/>
-+    <property name='movdiri' type='boolean' value='false'/>
-+    <property name='acpi' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512bw' type='boolean' value='false'/>
-+    <property name='ace2' type='boolean' value='false'/>
-+    <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-ept-2mb' type='boolean' value='false'/>
-+    <property name='vmx-ept-1gb' type='boolean' value='false'/>
-+    <property name='ht' type='boolean' value='false'/>
-+    <property name='vmx-io-exit' type='boolean' value='false'/>
-+    <property name='nx' type='boolean' value='true' migratable='yes'/>
-+    <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
-+    <property name='mmxext' type='boolean' value='true' migratable='yes'/>
-+    <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-+    <property name='vaes' type='boolean' value='true' migratable='yes'/>
-+    <property name='serialize' type='boolean' value='false'/>
-+    <property name='movdir64b' type='boolean' value='false'/>
-+    <property name='xsaves' type='boolean' value='false'/>
-+    <property name='vmx-shadow-vmcs' type='boolean' value='false'/>
-+    <property name='lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-exit-save-preemption-timer' type='boolean' value='false'/>
-+    <property name='vmx-entry-load-pat' type='boolean' value='false'/>
-+    <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'/>
-+    <property name='vmx-store-lma' type='boolean' value='false'/>
-+    <property name='vmx-movdr-exit' type='boolean' value='false'/>
-+    <property name='pse' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx2' type='boolean' value='true' migratable='yes'/>
-+    <property name='avic' type='boolean' value='false'/>
-+    <property name='sep' type='boolean' value='true' migratable='yes'/>
-+    <property name='virt-ssbd' type='boolean' value='false'/>
-+    <property name='vmx-cr3-load-noexit' type='boolean' value='false'/>
-+    <property name='nodeid-msr' type='boolean' value='false'/>
-+    <property name='md-clear' type='boolean' value='false'/>
-+    <property name='sbpb' type='boolean' value='false'/>
-+    <property name='misalignsse' type='boolean' value='false'/>
-+    <property name='split-lock-detect' type='boolean' value='false'/>
-+    <property name='min-xlevel' type='number' value='2147483658'/>
-+    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
-+    <property name='tsc-scale' type='boolean' value='false'/>
-+    <property name='topoext' type='boolean' value='false'/>
-+    <property name='amd-stibp' type='boolean' value='false'/>
-+    <property name='vmx-preemption-timer' type='boolean' value='false'/>
-+    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-entry-load-pkrs' type='boolean' value='false'/>
-+    <property name='avx10-512' type='boolean' value='false'/>
-+    <property name='vmx-vnmi-pending' type='boolean' value='false'/>
-+    <property name='monitor' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-vintr-pending' type='boolean' value='false'/>
-+    <property name='avx512er' type='boolean' value='false'/>
-+    <property name='full-width-write' type='boolean' value='false'/>
-+    <property name='pmm-en' type='boolean' value='false'/>
-+    <property name='pcid' type='boolean' value='false'/>
-+    <property name='taa-no' type='boolean' value='false'/>
-+    <property name='avx10' type='boolean' value='false'/>
-+    <property name='arch-capabilities' type='boolean' value='false'/>
-+    <property name='vgif' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-secondary-ctls' type='boolean' value='false'/>
-+    <property name='vmx-xsaves' type='boolean' value='false'/>
-+    <property name='clzero' type='boolean' value='false'/>
-+    <property name='3dnow' type='boolean' value='true' migratable='yes'/>
-+    <property name='erms' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx-entry-ia32e-mode' type='boolean' value='false'/>
-+    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='overflow-recov' type='boolean' value='false'/>
-+    <property name='vpclmulqdq' type='boolean' value='false'/>
-+    <property name='vmx-ins-outs' type='boolean' value='false'/>
-+    <property name='fxsr-opt' type='boolean' value='false'/>
-+    <property name='xstore' type='boolean' value='false'/>
-+    <property name='rtm' type='boolean' value='false'/>
-+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
-+    <property name='sgx-aex-notify' type='boolean' value='false'/>
-+    <property name='bhi-ctrl' type='boolean' value='false'/>
-+    <property name='amx-bf16' type='boolean' value='false'/>
-+    <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='true' migratable='yes'/>
-+    <property name='cmpccxadd' type='boolean' value='true' migratable='yes'/>
-+    <property name='bhi-no' type='boolean' value='false'/>
-+    <property name='avx512-4vnniw' type='boolean' value='false'/>
-+    <property name='vme' type='boolean' value='false'/>
-+    <property name='vmx' type='boolean' value='false'/>
-+    <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='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'/>
-+    <property name='tbm' type='boolean' value='false'/>
-+    <property name='wdt' type='boolean' value='false'/>
-+    <property name='vmx-rdpmc-exit' type='boolean' value='false'/>
-+    <property name='vmx-mtf' type='boolean' value='false'/>
-+    <property name='vmx-entry-load-efer' type='boolean' value='false'/>
-+    <property name='eraps' type='boolean' value='false'/>
-+    <property name='wrmsrns' type='boolean' value='false'/>
-+    <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
-+    <property name='sha-ni' type='boolean' value='true' migratable='yes'/>
-+    <property name='rrsba-ctrl' type='boolean' value='false'/>
-+    <property name='fb-clear' type='boolean' value='false'/>
-+    <property name='vmx-exit-load-pkrs' type='boolean' value='false'/>
-+    <property name='abm' type='boolean' value='true' migratable='yes'/>
-+    <property name='sha512' type='boolean' value='false'/>
-+    <property name='vmx-ept-advanced-exitinfo' type='boolean' value='false'/>
-+    <property name='vmx-enable-user-wait-pause' type='boolean' value='false'/>
-+    <property name='avx512pf' type='boolean' value='false'/>
-+    <property name='vmx-hlt-exit' type='boolean' value='false'/>
-+    <property name='xstore-en' type='boolean' value='false'/>
-+  </hostCPU>
-+  <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
-+    <blocker name='kvm'/>
-+  </cpu>
-+  <cpu type='tcg' name='base' typename='base-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='qemu64-v1' typename='qemu64-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='qemu32-v1' typename='qemu32-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='phenom-v1' typename='phenom-v1-x86_64-cpu' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+  </cpu>
-+  <cpu type='tcg' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+  </cpu>
-+  <cpu type='tcg' name='pentium3-v1' typename='pentium3-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='pentium2-v1' typename='pentium2-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='pentium-v1' typename='pentium-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='n270-v1' typename='n270-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='kvm64-v1' typename='kvm64-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='kvm32-v1' typename='kvm32-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='coreduo-v1' typename='coreduo-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='core2duo-v1' typename='core2duo-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='athlon-v1' typename='athlon-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='athlon' typename='athlon-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='Westmere-v2' typename='Westmere-v2-x86_64-cpu' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Westmere-v1' typename='Westmere-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='Snowridge-v4' typename='Snowridge-v4-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='gfni'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='Snowridge-v3' typename='Snowridge-v3-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='gfni'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='core-capability'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='split-lock-detect'/>
-+  </cpu>
-+  <cpu type='tcg' name='Snowridge-v2' typename='Snowridge-v2-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='gfni'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='core-capability'/>
-+    <blocker name='ssbd'/>
-+    <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='tsc-deadline'/>
-+    <blocker name='gfni'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='core-capability'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='split-lock-detect'/>
-+  </cpu>
-+  <cpu type='tcg' name='Snowridge' typename='Snowridge-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='gfni'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='core-capability'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='split-lock-detect'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Server-v5' typename='Skylake-Server-v5-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Server-v4' typename='Skylake-Server-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Server-v3' typename='Skylake-Server-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Server-v2' typename='Skylake-Server-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Server-v1' typename='Skylake-Server-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Server-noTSX-IBRS' typename='Skylake-Server-noTSX-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Client-v4' typename='Skylake-Client-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Client-v3' typename='Skylake-Client-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Client-v2' typename='Skylake-Client-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Client-v1' typename='Skylake-Client-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Client-noTSX-IBRS' typename='Skylake-Client-noTSX-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='SierraForest-v2' typename='SierraForest-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='tsc-adjust'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='serialize'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='avx-vnni'/>
-+    <blocker name='avx-ifma'/>
-+    <blocker name='lam'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='avx-vnni-int8'/>
-+    <blocker name='avx-ne-convert'/>
-+    <blocker name='intel-psfd'/>
-+    <blocker name='ipred-ctrl'/>
-+    <blocker name='rrsba-ctrl'/>
-+    <blocker name='bhi-ctrl'/>
-+    <blocker name='mcdt-no'/>
-+  </cpu>
-+  <cpu type='tcg' name='SierraForest-v1' typename='SierraForest-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='serialize'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='avx-vnni'/>
-+    <blocker name='avx-ifma'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='avx-vnni-int8'/>
-+    <blocker name='avx-ne-convert'/>
-+    <blocker name='mcdt-no'/>
-+  </cpu>
-+  <cpu type='tcg' name='SierraForest' typename='SierraForest-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='serialize'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='avx-vnni'/>
-+    <blocker name='avx-ifma'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='avx-vnni-int8'/>
-+    <blocker name='avx-ne-convert'/>
-+    <blocker name='mcdt-no'/>
-+  </cpu>
-+  <cpu type='tcg' name='SapphireRapids-v3' typename='SapphireRapids-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='tsc-adjust'/>
-+    <blocker name='hle'/>
-+    <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='avx512vbmi2'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='avx512bitalg'/>
-+    <blocker name='avx512-vpopcntdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <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-v2' typename='SapphireRapids-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <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='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='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='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' typename='SapphireRapids-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <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='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='SandyBridge-v2' typename='SandyBridge-v2-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='SandyBridge-v1' typename='SandyBridge-v1-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+  </cpu>
-+  <cpu type='tcg' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+  </cpu>
-+  <cpu type='tcg' name='Penryn-v1' typename='Penryn-v1-x86_64-cpu' usable='yes'/>
-+  <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='xop'/>
-+    <blocker name='fma4'/>
-+    <blocker name='tbm'/>
-+    <blocker name='nrip-save'/>
-+  </cpu>
-+  <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
-+    <blocker name='misalignsse'/>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+    <blocker name='tbm'/>
-+    <blocker name='nrip-save'/>
-+  </cpu>
-+  <cpu type='tcg' name='Opteron_G4-v1' typename='Opteron_G4-v1-x86_64-cpu' usable='no'>
-+    <blocker name='misalignsse'/>
-+    <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='xop'/>
-+    <blocker name='fma4'/>
-+    <blocker name='nrip-save'/>
-+  </cpu>
-+  <cpu type='tcg' name='Opteron_G3-v1' typename='Opteron_G3-v1-x86_64-cpu' usable='no'>
-+    <blocker name='misalignsse'/>
-+  </cpu>
-+  <cpu type='tcg' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
-+    <blocker name='misalignsse'/>
-+  </cpu>
-+  <cpu type='tcg' name='Opteron_G2-v1' typename='Opteron_G2-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='Opteron_G1-v1' typename='Opteron_G1-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='Nehalem-v2' typename='Nehalem-v2-x86_64-cpu' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Nehalem-v1' typename='Nehalem-v1-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
-+  <cpu type='tcg' name='KnightsMill-v1' typename='KnightsMill-v1-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512pf'/>
-+    <blocker name='avx512er'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512-vpopcntdq'/>
-+    <blocker name='avx512-4vnniw'/>
-+    <blocker name='avx512-4fmaps'/>
-+  </cpu>
-+  <cpu type='tcg' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512pf'/>
-+    <blocker name='avx512er'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512-vpopcntdq'/>
-+    <blocker name='avx512-4vnniw'/>
-+    <blocker name='avx512-4fmaps'/>
-+  </cpu>
-+  <cpu type='tcg' name='IvyBridge-v2' typename='IvyBridge-v2-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='IvyBridge-v1' typename='IvyBridge-v1-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+  </cpu>
-+  <cpu type='tcg' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+  </cpu>
-+  <cpu type='tcg' name='Icelake-Server-v7' typename='Icelake-Server-v7-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <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='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='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='Icelake-Server-v6' typename='Icelake-Server-v6-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512ifma'/>
-+    <blocker name='avx512cd'/>
-+    <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='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='Icelake-Server-v5' typename='Icelake-Server-v5-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512ifma'/>
-+    <blocker name='avx512cd'/>
-+    <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='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='Icelake-Server-v4' typename='Icelake-Server-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512ifma'/>
-+    <blocker name='avx512cd'/>
-+    <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='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Icelake-Server-v3' typename='Icelake-Server-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <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='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Icelake-Server-v2' typename='Icelake-Server-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <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='spec-ctrl'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Icelake-Server-v1' typename='Icelake-Server-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <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='spec-ctrl'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Icelake-Server-noTSX' typename='Icelake-Server-noTSX-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <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='spec-ctrl'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <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='spec-ctrl'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-v4' typename='Haswell-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-v3' typename='Haswell-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-v2' typename='Haswell-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-v1' typename='Haswell-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </cpu>
-+  <cpu type='tcg' name='GraniteRapids-v2' typename='GraniteRapids-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='tsc-adjust'/>
-+    <blocker name='hle'/>
-+    <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='avx512vbmi2'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='avx512bitalg'/>
-+    <blocker name='avx512-vpopcntdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <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='avx10'/>
-+    <blocker name='mcdt-no'/>
-+    <blocker name='avx10-128'/>
-+    <blocker name='avx10-256'/>
-+    <blocker name='avx10-512'/>
-+  </cpu>
-+  <cpu type='tcg' name='GraniteRapids-v1' typename='GraniteRapids-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <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='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='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='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='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <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='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <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='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-v1' typename='EPYC-v1-x86_64-cpu' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <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='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='amd-stibp'/>
-+    <blocker name='amd-ssbd'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-Rome-v3' typename='EPYC-Rome-v3-x86_64-cpu' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='amd-stibp'/>
-+    <blocker name='amd-ssbd'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-Rome-v2' typename='EPYC-Rome-v2-x86_64-cpu' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='amd-stibp'/>
-+    <blocker name='amd-ssbd'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-Rome-v1' typename='EPYC-Rome-v1-x86_64-cpu' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='amd-stibp'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-Rome' typename='EPYC-Rome-x86_64-cpu' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='amd-stibp'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-Milan-v2' typename='EPYC-Milan-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='amd-stibp'/>
-+    <blocker name='stibp-always-on'/>
-+    <blocker name='amd-ssbd'/>
-+    <blocker name='amd-psfd'/>
-+    <blocker name='no-nested-data-bp'/>
-+    <blocker name='lfence-always-serializing'/>
-+    <blocker name='null-sel-clr-base'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-Milan-v1' typename='EPYC-Milan-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='amd-stibp'/>
-+    <blocker name='amd-ssbd'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-Milan' typename='EPYC-Milan-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='amd-stibp'/>
-+    <blocker name='amd-ssbd'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-Genoa-v1' typename='EPYC-Genoa-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512ifma'/>
-+    <blocker name='avx512cd'/>
-+    <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='avx512-bf16'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='amd-stibp'/>
-+    <blocker name='stibp-always-on'/>
-+    <blocker name='amd-ssbd'/>
-+    <blocker name='amd-psfd'/>
-+    <blocker name='no-nested-data-bp'/>
-+    <blocker name='lfence-always-serializing'/>
-+    <blocker name='null-sel-clr-base'/>
-+    <blocker name='auto-ibrs'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='vnmi'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-Genoa' typename='EPYC-Genoa-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512ifma'/>
-+    <blocker name='avx512cd'/>
-+    <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='avx512-bf16'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='perfctr-core'/>
-+    <blocker name='clzero'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='ibrs'/>
-+    <blocker name='amd-stibp'/>
-+    <blocker name='stibp-always-on'/>
-+    <blocker name='amd-ssbd'/>
-+    <blocker name='amd-psfd'/>
-+    <blocker name='no-nested-data-bp'/>
-+    <blocker name='lfence-always-serializing'/>
-+    <blocker name='null-sel-clr-base'/>
-+    <blocker name='auto-ibrs'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='vnmi'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <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='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='Dhyana-v1' typename='Dhyana-v1-x86_64-cpu' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Dhyana' typename='Dhyana-x86_64-cpu' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='nrip-save'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Denverton-v3' typename='Denverton-v3-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='Denverton-v2' typename='Denverton-v2-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Denverton-v1' typename='Denverton-v1-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Denverton' typename='Denverton-x86_64-cpu' usable='no'>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Cooperlake-v2' typename='Cooperlake-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='stibp'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='avx512-bf16'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='Cooperlake-v1' typename='Cooperlake-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='stibp'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='avx512-bf16'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Cooperlake' typename='Cooperlake-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='stibp'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='avx512-bf16'/>
-+    <blocker name='xsavec'/>
-+  </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'/>
-+  <cpu type='tcg' name='ClearwaterForest-v1' typename='ClearwaterForest-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='tsc-adjust'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='serialize'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='sha512'/>
-+    <blocker name='sm3'/>
-+    <blocker name='sm4'/>
-+    <blocker name='avx-vnni'/>
-+    <blocker name='avx-ifma'/>
-+    <blocker name='lam'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='avx-vnni-int8'/>
-+    <blocker name='avx-ne-convert'/>
-+    <blocker name='avx-vnni-int16'/>
-+    <blocker name='prefetchiti'/>
-+    <blocker name='intel-psfd'/>
-+    <blocker name='ipred-ctrl'/>
-+    <blocker name='rrsba-ctrl'/>
-+    <blocker name='ddpd-u'/>
-+    <blocker name='bhi-ctrl'/>
-+    <blocker name='mcdt-no'/>
-+  </cpu>
-+  <cpu type='tcg' name='ClearwaterForest' typename='ClearwaterForest-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='tsc-adjust'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='gfni'/>
-+    <blocker name='vpclmulqdq'/>
-+    <blocker name='bus-lock-detect'/>
-+    <blocker name='cldemote'/>
-+    <blocker name='movdiri'/>
-+    <blocker name='movdir64b'/>
-+    <blocker name='serialize'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='sha512'/>
-+    <blocker name='sm3'/>
-+    <blocker name='sm4'/>
-+    <blocker name='avx-vnni'/>
-+    <blocker name='avx-ifma'/>
-+    <blocker name='lam'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+    <blocker name='avx-vnni-int8'/>
-+    <blocker name='avx-ne-convert'/>
-+    <blocker name='avx-vnni-int16'/>
-+    <blocker name='prefetchiti'/>
-+    <blocker name='intel-psfd'/>
-+    <blocker name='ipred-ctrl'/>
-+    <blocker name='rrsba-ctrl'/>
-+    <blocker name='ddpd-u'/>
-+    <blocker name='bhi-ctrl'/>
-+    <blocker name='mcdt-no'/>
-+  </cpu>
-+  <cpu type='tcg' name='Cascadelake-Server-v5' typename='Cascadelake-Server-v5-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+    <blocker name='xsaves'/>
-+  </cpu>
-+  <cpu type='tcg' name='Cascadelake-Server-v4' typename='Cascadelake-Server-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Cascadelake-Server-v3' typename='Cascadelake-Server-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Cascadelake-Server-v2' typename='Cascadelake-Server-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Cascadelake-Server-v1' typename='Cascadelake-Server-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Cascadelake-Server-noTSX' typename='Cascadelake-Server-noTSX-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='arch-capabilities'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='ssbd'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell-v4' typename='Broadwell-v4-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell-v3' typename='Broadwell-v3-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell-v2' typename='Broadwell-v2-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell-v1' typename='Broadwell-v1-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='invpcid'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
-+    <blocker name='pcid'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='hle'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </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'/>
-+  <machine type='tcg' name='pc-i440fx-10.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-5.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-9.1' hotplugCpus='yes' maxCpus='4096' defaultCPU='qemu64-x86_64-cpu' 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-q35-8.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-8.1' hotplugCpus='yes' maxCpus='255' 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' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-9.1' hotplugCpus='yes' maxCpus='255' 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' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-10.0' alias='q35' hotplugCpus='yes' maxCpus='4096' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-7.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='x-remote' maxCpus='1' acpi='no'/>
-+  <machine type='tcg' name='pc-q35-5.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-6.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-5.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-9.0' hotplugCpus='yes' maxCpus='4096' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-7.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-8.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-8.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-6.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-9.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-7.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-5.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-9.2' hotplugCpus='yes' maxCpus='4096' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-7.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-8.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-8.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-5.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-6.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-9.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <machine type='tcg' name='pc-i440fx-7.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
-+  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-+  <hypervCapabilities supported='yes'>
-+    <cap name='relaxed'/>
-+    <cap name='vapic'/>
-+    <cap name='spinlocks'/>
-+    <cap name='vpindex'/>
-+    <cap name='runtime'/>
-+    <cap name='synic'/>
-+    <cap name='stimer'/>
-+    <cap name='reset'/>
-+    <cap name='vendor_id'/>
-+    <cap name='frequencies'/>
-+    <cap name='reenlightenment'/>
-+    <cap name='tlbflush'/>
-+    <cap name='ipi'/>
-+    <cap name='avic'/>
-+    <cap name='emsr_bitmap'/>
-+    <cap name='xmm_input'/>
-+  </hypervCapabilities>
-+</qemuCaps>
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemucapabilitiestest-Update-caps_10.0.0_x86_64-to-v9.2.0-1636-gffaf7f0376.patch b/SOURCES/libvirt-qemucapabilitiestest-Update-caps_10.0.0_x86_64-to-v9.2.0-1636-gffaf7f0376.patch
deleted file mode 100644
index 2c4b52d..0000000
--- a/SOURCES/libvirt-qemucapabilitiestest-Update-caps_10.0.0_x86_64-to-v9.2.0-1636-gffaf7f0376.patch
+++ /dev/null
@@ -1,13228 +0,0 @@
-From ea370379189eee4e7afb5783fb63890e191e8394 Mon Sep 17 00:00:00 2001
-Message-ID: <ea370379189eee4e7afb5783fb63890e191e8394.1739824249.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 7 Feb 2025 17:48:36 +0100
-Subject: [PATCH] qemucapabilitiestest: Update 'caps_10.0.0_x86_64' to
- 'v9.2.0-1636-gffaf7f0376'
-
-Notable changes:
-    - 'blockdev-set-active' QMP command and the corresponding 'active'
-      flag for instantiating blockdev backends added
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit c8c2996b2bb9c386a18911dd2bbb12e287f2ba21)
-
-https://issues.redhat.com/browse/RHEL-79095
----
- .../caps_10.0.0_x86_64.replies                | 3918 +++++++++--------
- .../caps_10.0.0_x86_64.xml                    |    2 +-
- 2 files changed, 1980 insertions(+), 1940 deletions(-)
-
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
-index a0a20c0717..a08546ae46 100644
---- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
-@@ -20,7 +20,7 @@
-       "minor": 2,
-       "major": 9
-     },
--    "package": "v9.2.0-1537-gd922088eb4"
-+    "package": "v9.2.0-1636-gffaf7f0376"
-   },
-   "id": "libvirt-2"
- }
-@@ -449,16 +449,22 @@
-       "arg-type": "60"
-     },
-     {
--      "name": "blockdev-create",
-+      "name": "blockdev-set-active",
-       "ret-type": "0",
-       "meta-type": "command",
-       "arg-type": "61"
-     },
-+    {
-+      "name": "blockdev-create",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "62"
-+    },
-     {
-       "name": "x-blockdev-amend",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "62",
-+      "arg-type": "63",
-       "features": [
-         "unstable"
-       ]
-@@ -466,54 +472,54 @@
-     {
-       "name": "BLOCK_IMAGE_CORRUPTED",
-       "meta-type": "event",
--      "arg-type": "63"
-+      "arg-type": "64"
-     },
-     {
-       "name": "BLOCK_IO_ERROR",
-       "meta-type": "event",
--      "arg-type": "64"
-+      "arg-type": "65"
-     },
-     {
-       "name": "BLOCK_JOB_COMPLETED",
-       "meta-type": "event",
--      "arg-type": "65"
-+      "arg-type": "66"
-     },
-     {
-       "name": "BLOCK_JOB_CANCELLED",
-       "meta-type": "event",
--      "arg-type": "66"
-+      "arg-type": "67"
-     },
-     {
-       "name": "BLOCK_JOB_ERROR",
-       "meta-type": "event",
--      "arg-type": "67"
-+      "arg-type": "68"
-     },
-     {
-       "name": "BLOCK_JOB_READY",
-       "meta-type": "event",
--      "arg-type": "68"
-+      "arg-type": "69"
-     },
-     {
-       "name": "BLOCK_JOB_PENDING",
-       "meta-type": "event",
--      "arg-type": "69"
-+      "arg-type": "70"
-     },
-     {
-       "name": "BLOCK_WRITE_THRESHOLD",
-       "meta-type": "event",
--      "arg-type": "70"
-+      "arg-type": "71"
-     },
-     {
-       "name": "block-set-write-threshold",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "71"
-+      "arg-type": "72"
-     },
-     {
-       "name": "x-blockdev-change",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "72",
-+      "arg-type": "73",
-       "features": [
-         "unstable"
-       ]
-@@ -522,7 +528,7 @@
-       "name": "x-blockdev-set-iothread",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "73",
-+      "arg-type": "74",
-       "features": [
-         "unstable"
-       ]
-@@ -530,36 +536,36 @@
-     {
-       "name": "QUORUM_FAILURE",
-       "meta-type": "event",
--      "arg-type": "74"
-+      "arg-type": "75"
-     },
-     {
-       "name": "QUORUM_REPORT_BAD",
-       "meta-type": "event",
--      "arg-type": "75"
-+      "arg-type": "76"
-     },
-     {
-       "name": "blockdev-snapshot-internal-sync",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "76"
-+      "arg-type": "77"
-     },
-     {
-       "name": "blockdev-snapshot-delete-internal-sync",
--      "ret-type": "78",
-+      "ret-type": "79",
-       "meta-type": "command",
--      "arg-type": "77"
-+      "arg-type": "78"
-     },
-     {
-       "name": "nbd-server-start",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "79"
-+      "arg-type": "80"
-     },
-     {
-       "name": "nbd-server-add",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "80",
-+      "arg-type": "81",
-       "features": [
-         "deprecated"
-       ]
-@@ -568,7 +574,7 @@
-       "name": "nbd-server-remove",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "81",
-+      "arg-type": "82",
-       "features": [
-         "deprecated"
-       ]
-@@ -583,34 +589,34 @@
-       "name": "block-export-add",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "82"
-+      "arg-type": "83"
-     },
-     {
-       "name": "block-export-del",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "83"
-+      "arg-type": "84"
-     },
-     {
-       "name": "BLOCK_EXPORT_DELETED",
-       "meta-type": "event",
--      "arg-type": "84"
-+      "arg-type": "85"
-     },
-     {
-       "name": "query-block-exports",
--      "ret-type": "[85]",
-+      "ret-type": "[86]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-chardev",
--      "ret-type": "[86]",
-+      "ret-type": "[87]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-chardev-backends",
--      "ret-type": "[87]",
-+      "ret-type": "[88]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -618,63 +624,63 @@
-       "name": "ringbuf-write",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "88"
-+      "arg-type": "89"
-     },
-     {
-       "name": "ringbuf-read",
-       "ret-type": "str",
-       "meta-type": "command",
--      "arg-type": "89"
-+      "arg-type": "90"
-     },
-     {
-       "name": "chardev-add",
--      "ret-type": "91",
-+      "ret-type": "92",
-       "meta-type": "command",
--      "arg-type": "90"
-+      "arg-type": "91"
-     },
-     {
-       "name": "chardev-change",
--      "ret-type": "91",
-+      "ret-type": "92",
-       "meta-type": "command",
--      "arg-type": "92"
-+      "arg-type": "93"
-     },
-     {
-       "name": "chardev-remove",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "93"
-+      "arg-type": "94"
-     },
-     {
-       "name": "chardev-send-break",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "94"
-+      "arg-type": "95"
-     },
-     {
-       "name": "VSERPORT_CHANGE",
-       "meta-type": "event",
--      "arg-type": "95"
-+      "arg-type": "96"
-     },
-     {
-       "name": "dump-guest-memory",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "96"
-+      "arg-type": "97"
-     },
-     {
-       "name": "query-dump",
--      "ret-type": "97",
-+      "ret-type": "98",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "DUMP_COMPLETED",
-       "meta-type": "event",
--      "arg-type": "98"
-+      "arg-type": "99"
-     },
-     {
-       "name": "query-dump-guest-memory-capability",
--      "ret-type": "99",
-+      "ret-type": "100",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -682,97 +688,97 @@
-       "name": "set_link",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "100"
-+      "arg-type": "101"
-     },
-     {
-       "name": "netdev_add",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "101"
-+      "arg-type": "102"
-     },
-     {
-       "name": "netdev_del",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "102"
-+      "arg-type": "103"
-     },
-     {
-       "name": "query-rx-filter",
--      "ret-type": "[104]",
-+      "ret-type": "[105]",
-       "meta-type": "command",
--      "arg-type": "103"
-+      "arg-type": "104"
-     },
-     {
-       "name": "NIC_RX_FILTER_CHANGED",
-       "meta-type": "event",
--      "arg-type": "105"
-+      "arg-type": "106"
-     },
-     {
-       "name": "announce-self",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "106"
-+      "arg-type": "107"
-     },
-     {
-       "name": "FAILOVER_NEGOTIATED",
-       "meta-type": "event",
--      "arg-type": "107"
-+      "arg-type": "108"
-     },
-     {
-       "name": "NETDEV_STREAM_CONNECTED",
-       "meta-type": "event",
--      "arg-type": "108"
-+      "arg-type": "109"
-     },
-     {
-       "name": "NETDEV_STREAM_DISCONNECTED",
-       "meta-type": "event",
--      "arg-type": "109"
-+      "arg-type": "110"
-     },
-     {
-       "name": "request-ebpf",
--      "ret-type": "111",
-+      "ret-type": "112",
-       "meta-type": "command",
--      "arg-type": "110"
-+      "arg-type": "111"
-     },
-     {
-       "name": "query-rocker",
--      "ret-type": "113",
-+      "ret-type": "114",
-       "meta-type": "command",
--      "arg-type": "112"
-+      "arg-type": "113"
-     },
-     {
-       "name": "query-rocker-ports",
--      "ret-type": "[115]",
-+      "ret-type": "[116]",
-       "meta-type": "command",
--      "arg-type": "114"
-+      "arg-type": "115"
-     },
-     {
-       "name": "query-rocker-of-dpa-flows",
--      "ret-type": "[117]",
-+      "ret-type": "[118]",
-       "meta-type": "command",
--      "arg-type": "116"
-+      "arg-type": "117"
-     },
-     {
-       "name": "query-rocker-of-dpa-groups",
--      "ret-type": "[119]",
-+      "ret-type": "[120]",
-       "meta-type": "command",
--      "arg-type": "118"
-+      "arg-type": "119"
-     },
-     {
-       "name": "query-tpm-models",
--      "ret-type": "[120]",
-+      "ret-type": "[121]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-tpm-types",
--      "ret-type": "[121]",
-+      "ret-type": "[122]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-tpm",
--      "ret-type": "[122]",
-+      "ret-type": "[123]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -780,40 +786,40 @@
-       "name": "set_password",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "123"
-+      "arg-type": "124"
-     },
-     {
-       "name": "expire_password",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "124"
-+      "arg-type": "125"
-     },
-     {
-       "name": "screendump",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "125"
-+      "arg-type": "126"
-     },
-     {
-       "name": "query-spice",
--      "ret-type": "126",
-+      "ret-type": "127",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "SPICE_CONNECTED",
-       "meta-type": "event",
--      "arg-type": "127"
-+      "arg-type": "128"
-     },
-     {
-       "name": "SPICE_INITIALIZED",
-       "meta-type": "event",
--      "arg-type": "128"
-+      "arg-type": "129"
-     },
-     {
-       "name": "SPICE_DISCONNECTED",
-       "meta-type": "event",
--      "arg-type": "129"
-+      "arg-type": "130"
-     },
-     {
-       "name": "SPICE_MIGRATE_COMPLETED",
-@@ -822,13 +828,13 @@
-     },
-     {
-       "name": "query-vnc",
--      "ret-type": "130",
-+      "ret-type": "131",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-vnc-servers",
--      "ret-type": "[131]",
-+      "ret-type": "[132]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -836,26 +842,26 @@
-       "name": "change-vnc-password",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "132"
-+      "arg-type": "133"
-     },
-     {
-       "name": "VNC_CONNECTED",
-       "meta-type": "event",
--      "arg-type": "133"
-+      "arg-type": "134"
-     },
-     {
-       "name": "VNC_INITIALIZED",
-       "meta-type": "event",
--      "arg-type": "134"
-+      "arg-type": "135"
-     },
-     {
-       "name": "VNC_DISCONNECTED",
-       "meta-type": "event",
--      "arg-type": "135"
-+      "arg-type": "136"
-     },
-     {
-       "name": "query-mice",
--      "ret-type": "[136]",
-+      "ret-type": "[137]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -863,17 +869,17 @@
-       "name": "send-key",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "137"
-+      "arg-type": "138"
-     },
-     {
-       "name": "input-send-event",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "138"
-+      "arg-type": "139"
-     },
-     {
-       "name": "query-display-options",
--      "ret-type": "139",
-+      "ret-type": "140",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -881,23 +887,23 @@
-       "name": "display-reload",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "140"
-+      "arg-type": "141"
-     },
-     {
-       "name": "display-update",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "141"
-+      "arg-type": "142"
-     },
-     {
-       "name": "client_migrate_info",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "142"
-+      "arg-type": "143"
-     },
-     {
-       "name": "query-migrate",
--      "ret-type": "143",
-+      "ret-type": "144",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -905,11 +911,11 @@
-       "name": "migrate-set-capabilities",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "144"
-+      "arg-type": "145"
-     },
-     {
-       "name": "query-migrate-capabilities",
--      "ret-type": "[145]",
-+      "ret-type": "[146]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -917,11 +923,11 @@
-       "name": "migrate-set-parameters",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "146"
-+      "arg-type": "147"
-     },
-     {
-       "name": "query-migrate-parameters",
--      "ret-type": "147",
-+      "ret-type": "148",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -934,17 +940,17 @@
-     {
-       "name": "MIGRATION",
-       "meta-type": "event",
--      "arg-type": "148"
-+      "arg-type": "149"
-     },
-     {
-       "name": "MIGRATION_PASS",
-       "meta-type": "event",
--      "arg-type": "149"
-+      "arg-type": "150"
-     },
-     {
-       "name": "COLO_EXIT",
-       "meta-type": "event",
--      "arg-type": "150"
-+      "arg-type": "151"
-     },
-     {
-       "name": "x-colo-lost-heartbeat",
-@@ -965,47 +971,47 @@
-       "name": "migrate-continue",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "151"
-+      "arg-type": "152"
-     },
-     {
-       "name": "migrate",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "152"
-+      "arg-type": "153"
-     },
-     {
-       "name": "migrate-incoming",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "153"
-+      "arg-type": "154"
-     },
-     {
-       "name": "xen-save-devices-state",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "154"
-+      "arg-type": "155"
-     },
-     {
-       "name": "xen-set-global-dirty-log",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "155"
-+      "arg-type": "156"
-     },
-     {
-       "name": "xen-load-devices-state",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "156"
-+      "arg-type": "157"
-     },
-     {
-       "name": "xen-set-replication",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "157"
-+      "arg-type": "158"
-     },
-     {
-       "name": "query-xen-replication-status",
--      "ret-type": "158",
-+      "ret-type": "159",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -1017,7 +1023,7 @@
-     },
-     {
-       "name": "query-colo-status",
--      "ret-type": "159",
-+      "ret-type": "160",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -1026,7 +1032,7 @@
-       "ret-type": "0",
-       "allow-oob": true,
-       "meta-type": "command",
--      "arg-type": "160"
-+      "arg-type": "161"
-     },
-     {
-       "name": "migrate-pause",
-@@ -1038,41 +1044,41 @@
-     {
-       "name": "UNPLUG_PRIMARY",
-       "meta-type": "event",
--      "arg-type": "161"
-+      "arg-type": "162"
-     },
-     {
-       "name": "calc-dirty-rate",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "162"
-+      "arg-type": "163"
-     },
-     {
-       "name": "query-dirty-rate",
--      "ret-type": "164",
-+      "ret-type": "165",
-       "meta-type": "command",
--      "arg-type": "163"
-+      "arg-type": "164"
-     },
-     {
-       "name": "set-vcpu-dirty-limit",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "165"
-+      "arg-type": "166"
-     },
-     {
-       "name": "cancel-vcpu-dirty-limit",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "166"
-+      "arg-type": "167"
-     },
-     {
-       "name": "query-vcpu-dirty-limit",
--      "ret-type": "[167]",
-+      "ret-type": "[168]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-migrationthreads",
--      "ret-type": "[168]",
-+      "ret-type": "[169]",
-       "meta-type": "command",
-       "arg-type": "0",
-       "features": [
-@@ -1083,53 +1089,53 @@
-       "name": "snapshot-save",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "169"
-+      "arg-type": "170"
-     },
-     {
-       "name": "snapshot-load",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "170"
-+      "arg-type": "171"
-     },
-     {
-       "name": "snapshot-delete",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "171"
-+      "arg-type": "172"
-     },
-     {
-       "name": "transaction",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "172"
-+      "arg-type": "173"
-     },
-     {
-       "name": "trace-event-get-state",
--      "ret-type": "[174]",
-+      "ret-type": "[175]",
-       "meta-type": "command",
--      "arg-type": "173"
-+      "arg-type": "174"
-     },
-     {
-       "name": "trace-event-set-state",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "175"
-+      "arg-type": "176"
-     },
-     {
-       "name": "qmp_capabilities",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "176"
-+      "arg-type": "177"
-     },
-     {
-       "name": "query-version",
--      "ret-type": "177",
-+      "ret-type": "178",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-commands",
--      "ret-type": "[178]",
-+      "ret-type": "[179]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -1141,63 +1147,63 @@
-     },
-     {
-       "name": "query-qmp-schema",
--      "ret-type": "[179]",
-+      "ret-type": "[180]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "qom-list",
--      "ret-type": "[181]",
-+      "ret-type": "[182]",
-       "meta-type": "command",
--      "arg-type": "180"
-+      "arg-type": "181"
-     },
-     {
-       "name": "qom-get",
-       "ret-type": "any",
-       "meta-type": "command",
--      "arg-type": "182"
-+      "arg-type": "183"
-     },
-     {
-       "name": "qom-set",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "183"
-+      "arg-type": "184"
-     },
-     {
-       "name": "qom-list-types",
--      "ret-type": "[185]",
-+      "ret-type": "[186]",
-       "meta-type": "command",
--      "arg-type": "184"
-+      "arg-type": "185"
-     },
-     {
-       "name": "qom-list-properties",
--      "ret-type": "[181]",
-+      "ret-type": "[182]",
-       "meta-type": "command",
--      "arg-type": "186"
-+      "arg-type": "187"
-     },
-     {
-       "name": "object-add",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "187"
-+      "arg-type": "188"
-     },
-     {
-       "name": "object-del",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "188"
-+      "arg-type": "189"
-     },
-     {
-       "name": "device-list-properties",
--      "ret-type": "[181]",
-+      "ret-type": "[182]",
-       "meta-type": "command",
--      "arg-type": "189"
-+      "arg-type": "190"
-     },
-     {
-       "name": "device_add",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "190",
-+      "arg-type": "191",
-       "features": [
-         "json-cli",
-         "json-cli-hotplug"
-@@ -1207,60 +1213,60 @@
-       "name": "device_del",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "191"
-+      "arg-type": "192"
-     },
-     {
-       "name": "DEVICE_DELETED",
-       "meta-type": "event",
--      "arg-type": "192"
-+      "arg-type": "193"
-     },
-     {
-       "name": "DEVICE_UNPLUG_GUEST_ERROR",
-       "meta-type": "event",
--      "arg-type": "193"
-+      "arg-type": "194"
-     },
-     {
-       "name": "device-sync-config",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "194",
-+      "arg-type": "195",
-       "features": [
-         "unstable"
-       ]
-     },
-     {
-       "name": "query-cpus-fast",
--      "ret-type": "[195]",
-+      "ret-type": "[196]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-machines",
--      "ret-type": "[197]",
-+      "ret-type": "[198]",
-       "meta-type": "command",
--      "arg-type": "196"
-+      "arg-type": "197"
-     },
-     {
-       "name": "query-current-machine",
--      "ret-type": "198",
-+      "ret-type": "199",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-target",
--      "ret-type": "199",
-+      "ret-type": "200",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-uuid",
--      "ret-type": "200",
-+      "ret-type": "201",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-vm-generation-id",
--      "ret-type": "201",
-+      "ret-type": "202",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -1290,7 +1296,7 @@
-     },
-     {
-       "name": "query-kvm",
--      "ret-type": "202",
-+      "ret-type": "203",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -1298,23 +1304,23 @@
-       "name": "memsave",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "203"
-+      "arg-type": "204"
-     },
-     {
-       "name": "pmemsave",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "204"
-+      "arg-type": "205"
-     },
-     {
-       "name": "query-memdev",
--      "ret-type": "[205]",
-+      "ret-type": "[206]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-hotpluggable-cpus",
--      "ret-type": "[206]",
-+      "ret-type": "[207]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -1322,56 +1328,56 @@
-       "name": "set-numa-node",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "207"
-+      "arg-type": "208"
-     },
-     {
-       "name": "balloon",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "208"
-+      "arg-type": "209"
-     },
-     {
-       "name": "query-balloon",
--      "ret-type": "209",
-+      "ret-type": "210",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "BALLOON_CHANGE",
-       "meta-type": "event",
--      "arg-type": "210"
-+      "arg-type": "211"
-     },
-     {
-       "name": "query-hv-balloon-status-report",
--      "ret-type": "211",
-+      "ret-type": "212",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "HV_BALLOON_STATUS_REPORT",
-       "meta-type": "event",
--      "arg-type": "211"
-+      "arg-type": "212"
-     },
-     {
-       "name": "query-memory-size-summary",
--      "ret-type": "212",
-+      "ret-type": "213",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-memory-devices",
--      "ret-type": "[213]",
-+      "ret-type": "[214]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "MEMORY_DEVICE_SIZE_CHANGE",
-       "meta-type": "event",
--      "arg-type": "214"
-+      "arg-type": "215"
-     },
-     {
-       "name": "x-query-irq",
--      "ret-type": "215",
-+      "ret-type": "216",
-       "meta-type": "command",
-       "arg-type": "0",
-       "features": [
-@@ -1380,7 +1386,7 @@
-     },
-     {
-       "name": "x-query-jit",
--      "ret-type": "215",
-+      "ret-type": "216",
-       "meta-type": "command",
-       "arg-type": "0",
-       "features": [
-@@ -1389,7 +1395,7 @@
-     },
-     {
-       "name": "x-query-numa",
--      "ret-type": "215",
-+      "ret-type": "216",
-       "meta-type": "command",
-       "arg-type": "0",
-       "features": [
-@@ -1398,7 +1404,7 @@
-     },
-     {
-       "name": "x-query-opcount",
--      "ret-type": "215",
-+      "ret-type": "216",
-       "meta-type": "command",
-       "arg-type": "0",
-       "features": [
-@@ -1407,7 +1413,7 @@
-     },
-     {
-       "name": "x-query-ramblock",
--      "ret-type": "215",
-+      "ret-type": "216",
-       "meta-type": "command",
-       "arg-type": "0",
-       "features": [
-@@ -1416,7 +1422,7 @@
-     },
-     {
-       "name": "x-query-roms",
--      "ret-type": "215",
-+      "ret-type": "216",
-       "meta-type": "command",
-       "arg-type": "0",
-       "features": [
-@@ -1425,7 +1431,7 @@
-     },
-     {
-       "name": "x-query-usb",
--      "ret-type": "215",
-+      "ret-type": "216",
-       "meta-type": "command",
-       "arg-type": "0",
-       "features": [
-@@ -1436,11 +1442,11 @@
-       "name": "dumpdtb",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "216"
-+      "arg-type": "217"
-     },
-     {
-       "name": "x-query-interrupt-controllers",
--      "ret-type": "215",
-+      "ret-type": "216",
-       "meta-type": "command",
-       "arg-type": "0",
-       "features": [
-@@ -1449,19 +1455,19 @@
-     },
-     {
-       "name": "query-cpu-model-expansion",
--      "ret-type": "222",
-+      "ret-type": "223",
-       "meta-type": "command",
--      "arg-type": "221"
-+      "arg-type": "222"
-     },
-     {
-       "name": "query-cpu-definitions",
--      "ret-type": "[223]",
-+      "ret-type": "[224]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-replay",
--      "ret-type": "227",
-+      "ret-type": "228",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -1469,7 +1475,7 @@
-       "name": "replay-break",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "228"
-+      "arg-type": "229"
-     },
-     {
-       "name": "replay-delete-break",
-@@ -1481,18 +1487,18 @@
-       "name": "replay-seek",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "229"
-+      "arg-type": "230"
-     },
-     {
-       "name": "yank",
-       "ret-type": "0",
-       "allow-oob": true,
-       "meta-type": "command",
--      "arg-type": "230"
-+      "arg-type": "231"
-     },
-     {
-       "name": "query-yank",
--      "ret-type": "[231]",
-+      "ret-type": "[232]",
-       "allow-oob": true,
-       "meta-type": "command",
-       "arg-type": "0"
-@@ -1501,17 +1507,17 @@
-       "name": "add_client",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "232"
-+      "arg-type": "233"
-     },
-     {
-       "name": "query-name",
--      "ret-type": "233",
-+      "ret-type": "234",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-iothreads",
--      "ret-type": "[234]",
-+      "ret-type": "[235]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -1540,7 +1546,7 @@
-       "name": "human-monitor-command",
-       "ret-type": "str",
-       "meta-type": "command",
--      "arg-type": "235",
-+      "arg-type": "236",
-       "features": [
-         "savevm-monitor-nodes"
-       ]
-@@ -1549,47 +1555,47 @@
-       "name": "getfd",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "236"
-+      "arg-type": "237"
-     },
-     {
-       "name": "closefd",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "238"
-+      "arg-type": "239"
-     },
-     {
-       "name": "add-fd",
--      "ret-type": "240",
-+      "ret-type": "241",
-       "meta-type": "command",
--      "arg-type": "239"
-+      "arg-type": "240"
-     },
-     {
-       "name": "remove-fd",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "241"
-+      "arg-type": "242"
-     },
-     {
-       "name": "query-fdsets",
--      "ret-type": "[242]",
-+      "ret-type": "[243]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-command-line-options",
--      "ret-type": "[244]",
-+      "ret-type": "[245]",
-       "meta-type": "command",
--      "arg-type": "243"
-+      "arg-type": "244"
-     },
-     {
-       "name": "RTC_CHANGE",
-       "meta-type": "event",
--      "arg-type": "245"
-+      "arg-type": "246"
-     },
-     {
-       "name": "VFU_CLIENT_HANGUP",
-       "meta-type": "event",
--      "arg-type": "246"
-+      "arg-type": "247"
-     },
-     {
-       "name": "rtc-reset-reinjection",
-@@ -1599,19 +1605,19 @@
-     },
-     {
-       "name": "query-sev",
--      "ret-type": "247",
-+      "ret-type": "248",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-sev-launch-measure",
--      "ret-type": "248",
-+      "ret-type": "249",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-sev-capabilities",
--      "ret-type": "249",
-+      "ret-type": "250",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -1619,29 +1625,29 @@
-       "name": "sev-inject-launch-secret",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "250"
-+      "arg-type": "251"
-     },
-     {
-       "name": "query-sev-attestation-report",
--      "ret-type": "252",
-+      "ret-type": "253",
-       "meta-type": "command",
--      "arg-type": "251"
-+      "arg-type": "252"
-     },
-     {
-       "name": "query-sgx",
--      "ret-type": "255",
-+      "ret-type": "256",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-sgx-capabilities",
--      "ret-type": "255",
-+      "ret-type": "256",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "xen-event-list",
--      "ret-type": "[256]",
-+      "ret-type": "[257]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -1649,46 +1655,46 @@
-       "name": "xen-event-inject",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "257"
-+      "arg-type": "258"
-     },
-     {
-       "name": "query-audiodevs",
--      "ret-type": "[258]",
-+      "ret-type": "[259]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-acpi-ospm-status",
--      "ret-type": "[259]",
-+      "ret-type": "[260]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "ACPI_DEVICE_OST",
-       "meta-type": "event",
--      "arg-type": "260"
-+      "arg-type": "261"
-     },
-     {
-       "name": "query-pci",
--      "ret-type": "[261]",
-+      "ret-type": "[262]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-     {
-       "name": "query-stats",
--      "ret-type": "[263]",
-+      "ret-type": "[264]",
-       "meta-type": "command",
--      "arg-type": "262"
-+      "arg-type": "263"
-     },
-     {
-       "name": "query-stats-schemas",
--      "ret-type": "[265]",
-+      "ret-type": "[266]",
-       "meta-type": "command",
--      "arg-type": "264"
-+      "arg-type": "265"
-     },
-     {
-       "name": "x-query-virtio",
--      "ret-type": "[266]",
-+      "ret-type": "[267]",
-       "meta-type": "command",
-       "arg-type": "0",
-       "features": [
-@@ -1697,36 +1703,36 @@
-     },
-     {
-       "name": "x-query-virtio-status",
--      "ret-type": "268",
-+      "ret-type": "269",
-       "meta-type": "command",
--      "arg-type": "267",
-+      "arg-type": "268",
-       "features": [
-         "unstable"
-       ]
-     },
-     {
-       "name": "x-query-virtio-queue-status",
--      "ret-type": "270",
-+      "ret-type": "271",
-       "meta-type": "command",
--      "arg-type": "269",
-+      "arg-type": "270",
-       "features": [
-         "unstable"
-       ]
-     },
-     {
-       "name": "x-query-virtio-vhost-queue-status",
--      "ret-type": "272",
-+      "ret-type": "273",
-       "meta-type": "command",
--      "arg-type": "271",
-+      "arg-type": "272",
-       "features": [
-         "unstable"
-       ]
-     },
-     {
-       "name": "x-query-virtio-queue-element",
--      "ret-type": "274",
-+      "ret-type": "275",
-       "meta-type": "command",
--      "arg-type": "273",
-+      "arg-type": "274",
-       "features": [
-         "unstable"
-       ]
-@@ -1734,11 +1740,11 @@
-     {
-       "name": "VFIO_MIGRATION",
-       "meta-type": "event",
--      "arg-type": "275"
-+      "arg-type": "276"
-     },
-     {
-       "name": "query-cryptodev",
--      "ret-type": "[276]",
-+      "ret-type": "[277]",
-       "meta-type": "command",
-       "arg-type": "0"
-     },
-@@ -1746,43 +1752,43 @@
-       "name": "cxl-inject-general-media-event",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "277"
-+      "arg-type": "278"
-     },
-     {
-       "name": "cxl-inject-dram-event",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "278"
-+      "arg-type": "279"
-     },
-     {
-       "name": "cxl-inject-memory-module-event",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "279"
-+      "arg-type": "280"
-     },
-     {
-       "name": "cxl-inject-poison",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "280"
-+      "arg-type": "281"
-     },
-     {
-       "name": "cxl-inject-uncorrectable-errors",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "281"
-+      "arg-type": "282"
-     },
-     {
-       "name": "cxl-inject-correctable-error",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "282"
-+      "arg-type": "283"
-     },
-     {
-       "name": "cxl-add-dynamic-capacity",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "283",
-+      "arg-type": "284",
-       "features": [
-         "unstable"
-       ]
-@@ -1791,7 +1797,7 @@
-       "name": "cxl-release-dynamic-capacity",
-       "ret-type": "0",
-       "meta-type": "command",
--      "arg-type": "284",
-+      "arg-type": "285",
-       "features": [
-         "unstable"
-       ]
-@@ -1810,7 +1816,7 @@
-         },
-         {
-           "name": "status",
--          "type": "285"
-+          "type": "286"
-         }
-       ],
-       "meta-type": "object"
-@@ -1824,7 +1830,7 @@
-         },
-         {
-           "name": "reason",
--          "type": "286"
-+          "type": "287"
-         }
-       ],
-       "meta-type": "object"
-@@ -1838,7 +1844,7 @@
-         },
-         {
-           "name": "reason",
--          "type": "286"
-+          "type": "287"
-         }
-       ],
-       "meta-type": "object"
-@@ -1848,7 +1854,7 @@
-       "members": [
-         {
-           "name": "action",
--          "type": "287"
-+          "type": "288"
-         }
-       ],
-       "meta-type": "object"
-@@ -1858,7 +1864,7 @@
-       "members": [
-         {
-           "name": "action",
--          "type": "287"
-+          "type": "288"
-         }
-       ],
-       "meta-type": "object"
-@@ -1869,22 +1875,22 @@
-         {
-           "name": "reboot",
-           "default": null,
--          "type": "288"
-+          "type": "289"
-         },
-         {
-           "name": "shutdown",
-           "default": null,
--          "type": "289"
-+          "type": "290"
-         },
-         {
-           "name": "panic",
-           "default": null,
--          "type": "290"
-+          "type": "291"
-         },
-         {
-           "name": "watchdog",
-           "default": null,
--          "type": "287"
-+          "type": "288"
-         }
-       ],
-       "meta-type": "object"
-@@ -1894,12 +1900,12 @@
-       "members": [
-         {
-           "name": "action",
--          "type": "291"
-+          "type": "292"
-         },
-         {
-           "name": "info",
-           "default": null,
--          "type": "292"
-+          "type": "293"
-         }
-       ],
-       "meta-type": "object"
-@@ -1909,12 +1915,12 @@
-       "members": [
-         {
-           "name": "action",
--          "type": "291"
-+          "type": "292"
-         },
-         {
-           "name": "info",
-           "default": null,
--          "type": "292"
-+          "type": "293"
-         }
-       ],
-       "meta-type": "object"
-@@ -1924,15 +1930,15 @@
-       "members": [
-         {
-           "name": "recipient",
--          "type": "293"
-+          "type": "294"
-         },
-         {
-           "name": "action",
--          "type": "294"
-+          "type": "295"
-         },
-         {
-           "name": "flags",
--          "type": "295"
-+          "type": "296"
-         }
-       ],
-       "meta-type": "object"
-@@ -1946,7 +1952,7 @@
-         },
-         {
-           "name": "status",
--          "type": "296"
-+          "type": "297"
-         }
-       ],
-       "meta-type": "object"
-@@ -2025,11 +2031,11 @@
-         },
-         {
-           "name": "type",
--          "type": "297"
-+          "type": "298"
-         },
-         {
-           "name": "status",
--          "type": "296"
-+          "type": "297"
-         },
-         {
-           "name": "current-progress",
-@@ -2190,7 +2196,7 @@
-         {
-           "name": "read-only-mode",
-           "default": null,
--          "type": "298"
-+          "type": "299"
-         }
-       ],
-       "meta-type": "object"
-@@ -2417,7 +2423,7 @@
-         {
-           "name": "io-status",
-           "default": null,
--          "type": "299"
-+          "type": "300"
-         }
-       ],
-       "meta-type": "object"
-@@ -2458,12 +2464,12 @@
-         },
-         {
-           "name": "stats",
--          "type": "300"
-+          "type": "301"
-         },
-         {
-           "name": "driver-specific",
-           "default": null,
--          "type": "301"
-+          "type": "302"
-         },
-         {
-           "name": "parent",
-@@ -2489,7 +2495,7 @@
-       "variants": [
-         {
-           "case": "mirror",
--          "type": "302"
-+          "type": "303"
-         },
-         {
-           "case": "commit",
-@@ -2527,7 +2533,7 @@
-       "members": [
-         {
-           "name": "type",
--          "type": "297"
-+          "type": "298"
-         },
-         {
-           "name": "device",
-@@ -2555,7 +2561,7 @@
-         },
-         {
-           "name": "io-status",
--          "type": "299"
-+          "type": "300"
-         },
-         {
-           "name": "ready",
-@@ -2563,7 +2569,7 @@
-         },
-         {
-           "name": "status",
--          "type": "296"
-+          "type": "297"
-         },
-         {
-           "name": "auto-finalize",
-@@ -2631,7 +2637,7 @@
-         {
-           "name": "mode",
-           "default": null,
--          "type": "303"
-+          "type": "304"
-         }
-       ],
-       "meta-type": "object"
-@@ -2724,7 +2730,7 @@
-         {
-           "name": "on-error",
-           "default": null,
--          "type": "304"
-+          "type": "305"
-         },
-         {
-           "name": "filter-node-name",
-@@ -2758,7 +2764,7 @@
-         },
-         {
-           "name": "sync",
--          "type": "305"
-+          "type": "306"
-         },
-         {
-           "name": "speed",
-@@ -2773,7 +2779,7 @@
-         {
-           "name": "bitmap-mode",
-           "default": null,
--          "type": "306"
-+          "type": "307"
-         },
-         {
-           "name": "compress",
-@@ -2783,12 +2789,12 @@
-         {
-           "name": "on-source-error",
-           "default": null,
--          "type": "304"
-+          "type": "305"
-         },
-         {
-           "name": "on-target-error",
-           "default": null,
--          "type": "304"
-+          "type": "305"
-         },
-         {
-           "name": "auto-finalize",
-@@ -2813,7 +2819,7 @@
-         {
-           "name": "x-perf",
-           "default": null,
--          "type": "307",
-+          "type": "308",
-           "features": [
-             "unstable"
-           ]
-@@ -2830,7 +2836,7 @@
-         {
-           "name": "mode",
-           "default": null,
--          "type": "303"
-+          "type": "304"
-         }
-       ],
-       "meta-type": "object"
-@@ -2849,7 +2855,7 @@
-         },
-         {
-           "name": "sync",
--          "type": "305"
-+          "type": "306"
-         },
-         {
-           "name": "speed",
-@@ -2864,7 +2870,7 @@
-         {
-           "name": "bitmap-mode",
-           "default": null,
--          "type": "306"
-+          "type": "307"
-         },
-         {
-           "name": "compress",
-@@ -2874,12 +2880,12 @@
-         {
-           "name": "on-source-error",
-           "default": null,
--          "type": "304"
-+          "type": "305"
-         },
-         {
-           "name": "on-target-error",
-           "default": null,
--          "type": "304"
-+          "type": "305"
-         },
-         {
-           "name": "auto-finalize",
-@@ -2904,7 +2910,7 @@
-         {
-           "name": "x-perf",
-           "default": null,
--          "type": "307",
-+          "type": "308",
-           "features": [
-             "unstable"
-           ]
-@@ -2961,13 +2967,17 @@
-           "name": "backing_file_depth",
-           "type": "int"
-         },
-+        {
-+          "name": "active",
-+          "type": "bool"
-+        },
-         {
-           "name": "encrypted",
-           "type": "bool"
-         },
-         {
-           "name": "detect_zeroes",
--          "type": "308"
-+          "type": "309"
-         },
-         {
-           "name": "bps",
-@@ -2995,7 +3005,7 @@
-         },
-         {
-           "name": "image",
--          "type": "309"
-+          "type": "310"
-         },
-         {
-           "name": "bps_max",
-@@ -3069,7 +3079,7 @@
-         },
-         {
-           "name": "cache",
--          "type": "310"
-+          "type": "311"
-         },
-         {
-           "name": "write_threshold",
-@@ -3078,7 +3088,7 @@
-         {
-           "name": "dirty-bitmaps",
-           "default": null,
--          "type": "[311]"
-+          "type": "[312]"
-         }
-       ],
-       "meta-type": "object"
-@@ -3088,11 +3098,11 @@
-       "members": [
-         {
-           "name": "nodes",
--          "type": "[312]"
-+          "type": "[313]"
-         },
-         {
-           "name": "edges",
--          "type": "[313]"
-+          "type": "[314]"
-         }
-       ],
-       "meta-type": "object"
-@@ -3130,12 +3140,12 @@
-         },
-         {
-           "name": "sync",
--          "type": "305"
-+          "type": "306"
-         },
-         {
-           "name": "mode",
-           "default": null,
--          "type": "303"
-+          "type": "304"
-         },
-         {
-           "name": "speed",
-@@ -3155,12 +3165,12 @@
-         {
-           "name": "on-source-error",
-           "default": null,
--          "type": "304"
-+          "type": "305"
-         },
-         {
-           "name": "on-target-error",
-           "default": null,
--          "type": "304"
-+          "type": "305"
-         },
-         {
-           "name": "unmap",
-@@ -3170,7 +3180,7 @@
-         {
-           "name": "copy-mode",
-           "default": null,
--          "type": "314"
-+          "type": "315"
-         },
-         {
-           "name": "auto-finalize",
-@@ -3241,7 +3251,7 @@
-         },
-         {
-           "name": "bitmaps",
--          "type": "[315]"
-+          "type": "[316]"
-         }
-       ],
-       "meta-type": "object"
-@@ -3279,7 +3289,7 @@
-         },
-         {
-           "name": "sync",
--          "type": "305"
-+          "type": "306"
-         },
-         {
-           "name": "speed",
-@@ -3299,12 +3309,12 @@
-         {
-           "name": "on-source-error",
-           "default": null,
--          "type": "304"
-+          "type": "305"
-         },
-         {
-           "name": "on-target-error",
-           "default": null,
--          "type": "304"
-+          "type": "305"
-         },
-         {
-           "name": "filter-node-name",
-@@ -3314,7 +3324,7 @@
-         {
-           "name": "copy-mode",
-           "default": null,
--          "type": "314"
-+          "type": "315"
-         },
-         {
-           "name": "auto-finalize",
-@@ -3374,7 +3384,7 @@
-         {
-           "name": "on-error",
-           "default": null,
--          "type": "304"
-+          "type": "305"
-         },
-         {
-           "name": "filter-node-name",
-@@ -3479,7 +3489,7 @@
-       "variants": [
-         {
-           "case": "mirror",
--          "type": "316"
-+          "type": "317"
-         },
-         {
-           "case": "commit",
-@@ -3521,7 +3531,7 @@
-         },
-         {
-           "name": "type",
--          "type": "297"
-+          "type": "298"
-         }
-       ],
-       "meta-type": "object"
-@@ -3532,197 +3542,197 @@
-       "variants": [
-         {
-           "case": "blkdebug",
--          "type": "320"
-+          "type": "321"
-         },
-         {
-           "case": "blklogwrites",
--          "type": "321"
-+          "type": "322"
-         },
-         {
-           "case": "blkverify",
--          "type": "322"
-+          "type": "323"
-         },
-         {
-           "case": "blkreplay",
--          "type": "323"
-+          "type": "324"
-         },
-         {
-           "case": "bochs",
--          "type": "324"
-+          "type": "325"
-         },
-         {
-           "case": "cloop",
--          "type": "324"
-+          "type": "325"
-         },
-         {
-           "case": "compress",
--          "type": "324"
-+          "type": "325"
-         },
-         {
-           "case": "copy-before-write",
--          "type": "325"
-+          "type": "326"
-         },
-         {
-           "case": "copy-on-read",
--          "type": "326"
-+          "type": "327"
-         },
-         {
-           "case": "dmg",
--          "type": "324"
-+          "type": "325"
-         },
-         {
-           "case": "file",
--          "type": "327"
-+          "type": "328"
-         },
-         {
-           "case": "ftp",
--          "type": "328"
-+          "type": "329"
-         },
-         {
-           "case": "ftps",
--          "type": "329"
-+          "type": "330"
-         },
-         {
-           "case": "gluster",
--          "type": "330"
-+          "type": "331"
-         },
-         {
-           "case": "host_cdrom",
--          "type": "327"
-+          "type": "328"
-         },
-         {
-           "case": "host_device",
--          "type": "327"
-+          "type": "328"
-         },
-         {
-           "case": "http",
--          "type": "331"
-+          "type": "332"
-         },
-         {
-           "case": "https",
--          "type": "332"
-+          "type": "333"
-         },
-         {
-           "case": "io_uring",
--          "type": "333"
-+          "type": "334"
-         },
-         {
-           "case": "iscsi",
--          "type": "334"
-+          "type": "335"
-         },
-         {
-           "case": "luks",
--          "type": "335"
-+          "type": "336"
-         },
-         {
-           "case": "nbd",
--          "type": "336"
-+          "type": "337"
-         },
-         {
-           "case": "nfs",
--          "type": "337"
-+          "type": "338"
-         },
-         {
-           "case": "null-aio",
--          "type": "338"
-+          "type": "339"
-         },
-         {
-           "case": "null-co",
--          "type": "338"
-+          "type": "339"
-         },
-         {
-           "case": "nvme",
--          "type": "339"
-+          "type": "340"
-         },
-         {
-           "case": "nvme-io_uring",
--          "type": "340"
-+          "type": "341"
-         },
-         {
-           "case": "parallels",
--          "type": "324"
-+          "type": "325"
-         },
-         {
-           "case": "preallocate",
--          "type": "341"
-+          "type": "342"
-         },
-         {
-           "case": "qcow2",
--          "type": "342"
-+          "type": "343"
-         },
-         {
-           "case": "qcow",
--          "type": "343"
-+          "type": "344"
-         },
-         {
-           "case": "qed",
--          "type": "344"
-+          "type": "345"
-         },
-         {
-           "case": "quorum",
--          "type": "345"
-+          "type": "346"
-         },
-         {
-           "case": "raw",
--          "type": "346"
-+          "type": "347"
-         },
-         {
-           "case": "rbd",
--          "type": "347"
-+          "type": "348"
-         },
-         {
-           "case": "replication",
--          "type": "348"
-+          "type": "349"
-         },
-         {
-           "case": "snapshot-access",
--          "type": "324"
-+          "type": "325"
-         },
-         {
-           "case": "ssh",
--          "type": "349"
-+          "type": "350"
-         },
-         {
-           "case": "throttle",
--          "type": "350"
-+          "type": "351"
-         },
-         {
-           "case": "vdi",
--          "type": "324"
-+          "type": "325"
-         },
-         {
-           "case": "vhdx",
--          "type": "324"
-+          "type": "325"
-         },
-         {
-           "case": "virtio-blk-vfio-pci",
--          "type": "351"
-+          "type": "352"
-         },
-         {
-           "case": "virtio-blk-vhost-user",
--          "type": "352"
-+          "type": "353"
-         },
-         {
-           "case": "virtio-blk-vhost-vdpa",
--          "type": "353"
-+          "type": "354"
-         },
-         {
-           "case": "vmdk",
--          "type": "344"
-+          "type": "345"
-         },
-         {
-           "case": "vpc",
--          "type": "324"
-+          "type": "325"
-         },
-         {
-           "case": "vvfat",
--          "type": "354"
-+          "type": "355"
-         }
-       ],
-       "members": [
-         {
-           "name": "driver",
--          "type": "317"
-+          "type": "318"
-         },
-         {
-           "name": "node-name",
-@@ -3732,12 +3742,17 @@
-         {
-           "name": "discard",
-           "default": null,
--          "type": "318"
-+          "type": "319"
-         },
-         {
-           "name": "cache",
-           "default": null,
--          "type": "319"
-+          "type": "320"
-+        },
-+        {
-+          "name": "active",
-+          "default": null,
-+          "type": "bool"
-         },
-         {
-           "name": "read-only",
-@@ -3757,7 +3772,7 @@
-         {
-           "name": "detect-zeroes",
-           "default": null,
--          "type": "308"
-+          "type": "309"
-         }
-       ],
-       "meta-type": "object"
-@@ -3784,6 +3799,21 @@
-     },
-     {
-       "name": "61",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "active",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "62",
-       "members": [
-         {
-           "name": "job-id",
-@@ -3791,13 +3821,13 @@
-         },
-         {
-           "name": "options",
--          "type": "355"
-+          "type": "356"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "62",
-+      "name": "63",
-       "members": [
-         {
-           "name": "job-id",
-@@ -3809,7 +3839,7 @@
-         },
-         {
-           "name": "options",
--          "type": "356"
-+          "type": "357"
-         },
-         {
-           "name": "force",
-@@ -3820,7 +3850,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "63",
-+      "name": "64",
-       "members": [
-         {
-           "name": "device",
-@@ -3853,7 +3883,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "64",
-+      "name": "65",
-       "members": [
-         {
-           "name": "qom-path",
-@@ -3870,11 +3900,11 @@
-         },
-         {
-           "name": "operation",
--          "type": "357"
-+          "type": "358"
-         },
-         {
-           "name": "action",
--          "type": "358"
-+          "type": "359"
-         },
-         {
-           "name": "nospace",
-@@ -3889,11 +3919,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "65",
-+      "name": "66",
-       "members": [
-         {
-           "name": "type",
--          "type": "297"
-+          "type": "298"
-         },
-         {
-           "name": "device",
-@@ -3920,11 +3950,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "66",
-+      "name": "67",
-       "members": [
-         {
-           "name": "type",
--          "type": "297"
-+          "type": "298"
-         },
-         {
-           "name": "device",
-@@ -3946,7 +3976,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "67",
-+      "name": "68",
-       "members": [
-         {
-           "name": "device",
-@@ -3954,21 +3984,21 @@
-         },
-         {
-           "name": "operation",
--          "type": "357"
-+          "type": "358"
-         },
-         {
-           "name": "action",
--          "type": "358"
-+          "type": "359"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "68",
-+      "name": "69",
-       "members": [
-         {
-           "name": "type",
--          "type": "297"
-+          "type": "298"
-         },
-         {
-           "name": "device",
-@@ -3990,11 +4020,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "69",
-+      "name": "70",
-       "members": [
-         {
-           "name": "type",
--          "type": "297"
-+          "type": "298"
-         },
-         {
-           "name": "id",
-@@ -4004,7 +4034,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "70",
-+      "name": "71",
-       "members": [
-         {
-           "name": "node-name",
-@@ -4022,7 +4052,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "71",
-+      "name": "72",
-       "members": [
-         {
-           "name": "node-name",
-@@ -4036,7 +4066,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "72",
-+      "name": "73",
-       "members": [
-         {
-           "name": "parent",
-@@ -4056,7 +4086,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "73",
-+      "name": "74",
-       "members": [
-         {
-           "name": "node-name",
-@@ -4064,7 +4094,7 @@
-         },
-         {
-           "name": "iothread",
--          "type": "359"
-+          "type": "360"
-         },
-         {
-           "name": "force",
-@@ -4075,7 +4105,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "74",
-+      "name": "75",
-       "members": [
-         {
-           "name": "reference",
-@@ -4093,11 +4123,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "75",
-+      "name": "76",
-       "members": [
-         {
-           "name": "type",
--          "type": "360"
-+          "type": "361"
-         },
-         {
-           "name": "error",
-@@ -4120,7 +4150,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "76",
-+      "name": "77",
-       "members": [
-         {
-           "name": "device",
-@@ -4134,7 +4164,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "77",
-+      "name": "78",
-       "members": [
-         {
-           "name": "device",
-@@ -4154,7 +4184,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "78",
-+      "name": "79",
-       "members": [
-         {
-           "name": "id",
-@@ -4193,11 +4223,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "79",
-+      "name": "80",
-       "members": [
-         {
-           "name": "addr",
--          "type": "361"
-+          "type": "362"
-         },
-         {
-           "name": "tls-creds",
-@@ -4218,7 +4248,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "80",
-+      "name": "81",
-       "members": [
-         {
-           "name": "name",
-@@ -4248,7 +4278,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "81",
-+      "name": "82",
-       "members": [
-         {
-           "name": "name",
-@@ -4257,36 +4287,36 @@
-         {
-           "name": "mode",
-           "default": null,
--          "type": "362"
-+          "type": "363"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "82",
-+      "name": "83",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "nbd",
--          "type": "364"
-+          "type": "365"
-         },
-         {
-           "case": "vhost-user-blk",
--          "type": "365"
-+          "type": "366"
-         },
-         {
-           "case": "fuse",
--          "type": "366"
-+          "type": "367"
-         },
-         {
-           "case": "vduse-blk",
--          "type": "367"
-+          "type": "368"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "363"
-+          "type": "364"
-         },
-         {
-           "name": "id",
-@@ -4315,12 +4345,17 @@
-           "name": "writethrough",
-           "default": null,
-           "type": "bool"
-+        },
-+        {
-+          "name": "allow-inactive",
-+          "default": null,
-+          "type": "bool"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "83",
-+      "name": "84",
-       "members": [
-         {
-           "name": "id",
-@@ -4329,13 +4364,13 @@
-         {
-           "name": "mode",
-           "default": null,
--          "type": "362"
-+          "type": "363"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "84",
-+      "name": "85",
-       "members": [
-         {
-           "name": "id",
-@@ -4345,12 +4380,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[85]",
--      "element-type": "85",
-+      "name": "[86]",
-+      "element-type": "86",
-       "meta-type": "array"
-     },
-     {
--      "name": "85",
-+      "name": "86",
-       "members": [
-         {
-           "name": "id",
-@@ -4358,7 +4393,7 @@
-         },
-         {
-           "name": "type",
--          "type": "363"
-+          "type": "364"
-         },
-         {
-           "name": "node-name",
-@@ -4372,12 +4407,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[86]",
--      "element-type": "86",
-+      "name": "[87]",
-+      "element-type": "87",
-       "meta-type": "array"
-     },
-     {
--      "name": "86",
-+      "name": "87",
-       "members": [
-         {
-           "name": "label",
-@@ -4395,12 +4430,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[87]",
--      "element-type": "87",
-+      "name": "[88]",
-+      "element-type": "88",
-       "meta-type": "array"
-     },
-     {
--      "name": "87",
-+      "name": "88",
-       "members": [
-         {
-           "name": "name",
-@@ -4410,7 +4445,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "88",
-+      "name": "89",
-       "members": [
-         {
-           "name": "device",
-@@ -4423,13 +4458,13 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "368"
-+          "type": "369"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "89",
-+      "name": "90",
-       "members": [
-         {
-           "name": "device",
-@@ -4442,7 +4477,7 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "368"
-+          "type": "369"
-         }
-       ],
-       "meta-type": "object"
-@@ -4453,7 +4488,7 @@
-       "meta-type": "builtin"
-     },
-     {
--      "name": "90",
-+      "name": "91",
-       "members": [
-         {
-           "name": "id",
-@@ -4461,13 +4496,13 @@
-         },
-         {
-           "name": "backend",
--          "type": "369"
-+          "type": "370"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "91",
-+      "name": "92",
-       "members": [
-         {
-           "name": "pty",
-@@ -4478,7 +4513,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "92",
-+      "name": "93",
-       "members": [
-         {
-           "name": "id",
-@@ -4486,13 +4521,13 @@
-         },
-         {
-           "name": "backend",
--          "type": "369"
-+          "type": "370"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "93",
-+      "name": "94",
-       "members": [
-         {
-           "name": "id",
-@@ -4502,7 +4537,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "94",
-+      "name": "95",
-       "members": [
-         {
-           "name": "id",
-@@ -4512,7 +4547,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "95",
-+      "name": "96",
-       "members": [
-         {
-           "name": "id",
-@@ -4526,7 +4561,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "96",
-+      "name": "97",
-       "members": [
-         {
-           "name": "paging",
-@@ -4554,17 +4589,17 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "370"
-+          "type": "371"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "97",
-+      "name": "98",
-       "members": [
-         {
-           "name": "status",
--          "type": "371"
-+          "type": "372"
-         },
-         {
-           "name": "completed",
-@@ -4578,11 +4613,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "98",
-+      "name": "99",
-       "members": [
-         {
-           "name": "result",
--          "type": "97"
-+          "type": "98"
-         },
-         {
-           "name": "error",
-@@ -4593,17 +4628,17 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "99",
-+      "name": "100",
-       "members": [
-         {
-           "name": "formats",
--          "type": "[370]"
-+          "type": "[371]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "100",
-+      "name": "101",
-       "members": [
-         {
-           "name": "name",
-@@ -4617,60 +4652,60 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "101",
-+      "name": "102",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "nic",
--          "type": "373"
-+          "type": "374"
-         },
-         {
-           "case": "user",
--          "type": "374"
-+          "type": "375"
-         },
-         {
-           "case": "tap",
--          "type": "375"
-+          "type": "376"
-         },
-         {
-           "case": "l2tpv3",
--          "type": "376"
-+          "type": "377"
-         },
-         {
-           "case": "socket",
--          "type": "377"
-+          "type": "378"
-         },
-         {
-           "case": "stream",
--          "type": "378"
-+          "type": "379"
-         },
-         {
-           "case": "dgram",
--          "type": "379"
-+          "type": "380"
-         },
-         {
-           "case": "vde",
--          "type": "380"
-+          "type": "381"
-         },
-         {
-           "case": "bridge",
--          "type": "381"
-+          "type": "382"
-         },
-         {
-           "case": "hubport",
--          "type": "382"
-+          "type": "383"
-         },
-         {
-           "case": "netmap",
--          "type": "383"
-+          "type": "384"
-         },
-         {
-           "case": "vhost-user",
--          "type": "385"
-+          "type": "386"
-         },
-         {
-           "case": "vhost-vdpa",
--          "type": "386"
-+          "type": "387"
-         },
-         {
-           "case": "none",
-@@ -4684,13 +4719,13 @@
-         },
-         {
-           "name": "type",
--          "type": "372"
-+          "type": "373"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "102",
-+      "name": "103",
-       "members": [
-         {
-           "name": "id",
-@@ -4700,7 +4735,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "103",
-+      "name": "104",
-       "members": [
-         {
-           "name": "name",
-@@ -4711,12 +4746,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[104]",
--      "element-type": "104",
-+      "name": "[105]",
-+      "element-type": "105",
-       "meta-type": "array"
-     },
-     {
--      "name": "104",
-+      "name": "105",
-       "members": [
-         {
-           "name": "name",
-@@ -4728,15 +4763,15 @@
-         },
-         {
-           "name": "multicast",
--          "type": "390"
-+          "type": "391"
-         },
-         {
-           "name": "unicast",
--          "type": "390"
-+          "type": "391"
-         },
-         {
-           "name": "vlan",
--          "type": "390"
-+          "type": "391"
-         },
-         {
-           "name": "broadcast-allowed",
-@@ -4770,7 +4805,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "105",
-+      "name": "106",
-       "members": [
-         {
-           "name": "name",
-@@ -4785,7 +4820,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "106",
-+      "name": "107",
-       "members": [
-         {
-           "name": "initial",
-@@ -4817,7 +4852,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "107",
-+      "name": "108",
-       "members": [
-         {
-           "name": "device-id",
-@@ -4827,7 +4862,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "108",
-+      "name": "109",
-       "members": [
-         {
-           "name": "netdev-id",
-@@ -4835,13 +4870,13 @@
-         },
-         {
-           "name": "addr",
--          "type": "391"
-+          "type": "392"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "109",
-+      "name": "110",
-       "members": [
-         {
-           "name": "netdev-id",
-@@ -4851,17 +4886,17 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "110",
-+      "name": "111",
-       "members": [
-         {
-           "name": "id",
--          "type": "392"
-+          "type": "393"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "111",
-+      "name": "112",
-       "members": [
-         {
-           "name": "object",
-@@ -4871,7 +4906,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "112",
-+      "name": "113",
-       "members": [
-         {
-           "name": "name",
-@@ -4881,7 +4916,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "113",
-+      "name": "114",
-       "members": [
-         {
-           "name": "name",
-@@ -4899,7 +4934,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "114",
-+      "name": "115",
-       "members": [
-         {
-           "name": "name",
-@@ -4909,12 +4944,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[115]",
--      "element-type": "115",
-+      "name": "[116]",
-+      "element-type": "116",
-       "meta-type": "array"
-     },
-     {
--      "name": "115",
-+      "name": "116",
-       "members": [
-         {
-           "name": "name",
-@@ -4934,17 +4969,17 @@
-         },
-         {
-           "name": "duplex",
--          "type": "393"
-+          "type": "394"
-         },
-         {
-           "name": "autoneg",
--          "type": "394"
-+          "type": "395"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "116",
-+      "name": "117",
-       "members": [
-         {
-           "name": "name",
-@@ -4959,12 +4994,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[117]",
--      "element-type": "117",
-+      "name": "[118]",
-+      "element-type": "118",
-       "meta-type": "array"
-     },
-     {
--      "name": "117",
-+      "name": "118",
-       "members": [
-         {
-           "name": "cookie",
-@@ -4976,21 +5011,21 @@
-         },
-         {
-           "name": "key",
--          "type": "395"
-+          "type": "396"
-         },
-         {
-           "name": "mask",
--          "type": "396"
-+          "type": "397"
-         },
-         {
-           "name": "action",
--          "type": "397"
-+          "type": "398"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "118",
-+      "name": "119",
-       "members": [
-         {
-           "name": "name",
-@@ -5005,12 +5040,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[119]",
--      "element-type": "119",
-+      "name": "[120]",
-+      "element-type": "120",
-       "meta-type": "array"
-     },
-     {
--      "name": "119",
-+      "name": "120",
-       "members": [
-         {
-           "name": "id",
-@@ -5079,12 +5114,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[120]",
--      "element-type": "120",
-+      "name": "[121]",
-+      "element-type": "121",
-       "meta-type": "array"
-     },
-     {
--      "name": "120",
-+      "name": "121",
-       "members": [
-         {
-           "name": "tpm-tis"
-@@ -5104,12 +5139,12 @@
-       ]
-     },
-     {
--      "name": "[121]",
--      "element-type": "121",
-+      "name": "[122]",
-+      "element-type": "122",
-       "meta-type": "array"
-     },
-     {
--      "name": "121",
-+      "name": "122",
-       "members": [
-         {
-           "name": "passthrough"
-@@ -5125,12 +5160,12 @@
-       ]
-     },
-     {
--      "name": "[122]",
--      "element-type": "122",
-+      "name": "[123]",
-+      "element-type": "123",
-       "meta-type": "array"
-     },
-     {
--      "name": "122",
-+      "name": "123",
-       "members": [
-         {
-           "name": "id",
-@@ -5138,22 +5173,22 @@
-         },
-         {
-           "name": "model",
--          "type": "120"
-+          "type": "121"
-         },
-         {
-           "name": "options",
--          "type": "398"
-+          "type": "399"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "123",
-+      "name": "124",
-       "tag": "protocol",
-       "variants": [
-         {
-           "case": "vnc",
--          "type": "401"
-+          "type": "402"
-         },
-         {
-           "case": "spice",
-@@ -5163,7 +5198,7 @@
-       "members": [
-         {
-           "name": "protocol",
--          "type": "399"
-+          "type": "400"
-         },
-         {
-           "name": "password",
-@@ -5172,18 +5207,18 @@
-         {
-           "name": "connected",
-           "default": null,
--          "type": "400"
-+          "type": "401"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "124",
-+      "name": "125",
-       "tag": "protocol",
-       "variants": [
-         {
-           "case": "vnc",
--          "type": "402"
-+          "type": "403"
-         },
-         {
-           "case": "spice",
-@@ -5193,7 +5228,7 @@
-       "members": [
-         {
-           "name": "protocol",
--          "type": "399"
-+          "type": "400"
-         },
-         {
-           "name": "time",
-@@ -5203,7 +5238,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "125",
-+      "name": "126",
-       "members": [
-         {
-           "name": "filename",
-@@ -5222,13 +5257,13 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "403"
-+          "type": "404"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "126",
-+      "name": "127",
-       "members": [
-         {
-           "name": "enabled",
-@@ -5265,60 +5300,60 @@
-         },
-         {
-           "name": "mouse-mode",
--          "type": "404"
-+          "type": "405"
-         },
-         {
-           "name": "channels",
-           "default": null,
--          "type": "[405]"
-+          "type": "[406]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "127",
-+      "name": "128",
-       "members": [
-         {
-           "name": "server",
--          "type": "406"
-+          "type": "407"
-         },
-         {
-           "name": "client",
--          "type": "406"
-+          "type": "407"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "128",
-+      "name": "129",
-       "members": [
-         {
-           "name": "server",
--          "type": "407"
-+          "type": "408"
-         },
-         {
-           "name": "client",
--          "type": "405"
-+          "type": "406"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "129",
-+      "name": "130",
-       "members": [
-         {
-           "name": "server",
--          "type": "406"
-+          "type": "407"
-         },
-         {
-           "name": "client",
--          "type": "406"
-+          "type": "407"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "130",
-+      "name": "131",
-       "members": [
-         {
-           "name": "enabled",
-@@ -5332,7 +5367,7 @@
-         {
-           "name": "family",
-           "default": null,
--          "type": "408"
-+          "type": "409"
-         },
-         {
-           "name": "service",
-@@ -5347,18 +5382,18 @@
-         {
-           "name": "clients",
-           "default": null,
--          "type": "[409]"
-+          "type": "[410]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[131]",
--      "element-type": "131",
-+      "name": "[132]",
-+      "element-type": "132",
-       "meta-type": "array"
-     },
-     {
--      "name": "131",
-+      "name": "132",
-       "members": [
-         {
-           "name": "id",
-@@ -5366,20 +5401,20 @@
-         },
-         {
-           "name": "server",
--          "type": "[410]"
-+          "type": "[411]"
-         },
-         {
-           "name": "clients",
--          "type": "[409]"
-+          "type": "[410]"
-         },
-         {
-           "name": "auth",
--          "type": "411"
-+          "type": "412"
-         },
-         {
-           "name": "vencrypt",
-           "default": null,
--          "type": "412"
-+          "type": "413"
-         },
-         {
-           "name": "display",
-@@ -5390,7 +5425,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "132",
-+      "name": "133",
-       "members": [
-         {
-           "name": "password",
-@@ -5400,54 +5435,54 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "133",
-+      "name": "134",
-       "members": [
-         {
-           "name": "server",
--          "type": "413"
-+          "type": "414"
-         },
-         {
-           "name": "client",
--          "type": "414"
-+          "type": "415"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "134",
-+      "name": "135",
-       "members": [
-         {
-           "name": "server",
--          "type": "413"
-+          "type": "414"
-         },
-         {
-           "name": "client",
--          "type": "409"
-+          "type": "410"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "135",
-+      "name": "136",
-       "members": [
-         {
-           "name": "server",
--          "type": "413"
-+          "type": "414"
-         },
-         {
-           "name": "client",
--          "type": "409"
-+          "type": "410"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[136]",
--      "element-type": "136",
-+      "name": "[137]",
-+      "element-type": "137",
-       "meta-type": "array"
-     },
-     {
--      "name": "136",
-+      "name": "137",
-       "members": [
-         {
-           "name": "name",
-@@ -5469,11 +5504,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "137",
-+      "name": "138",
-       "members": [
-         {
-           "name": "keys",
--          "type": "[415]"
-+          "type": "[416]"
-         },
-         {
-           "name": "hold-time",
-@@ -5484,7 +5519,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "138",
-+      "name": "139",
-       "members": [
-         {
-           "name": "device",
-@@ -5498,30 +5533,30 @@
-         },
-         {
-           "name": "events",
--          "type": "[416]"
-+          "type": "[417]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "139",
-+      "name": "140",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "curses",
--          "type": "421"
-+          "type": "422"
-         },
-         {
-           "case": "egl-headless",
--          "type": "422"
-+          "type": "423"
-         },
-         {
-           "case": "dbus",
--          "type": "423"
-+          "type": "424"
-         },
-         {
-           "case": "sdl",
--          "type": "424"
-+          "type": "425"
-         },
-         {
-           "case": "default",
-@@ -5539,7 +5574,7 @@
-       "members": [
-         {
-           "name": "type",
--          "type": "417"
-+          "type": "418"
-         },
-         {
-           "name": "full-screen",
-@@ -5559,47 +5594,47 @@
-         {
-           "name": "gl",
-           "default": null,
--          "type": "418"
-+          "type": "419"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "140",
-+      "name": "141",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "vnc",
--          "type": "426"
-+          "type": "427"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "425"
-+          "type": "426"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "141",
-+      "name": "142",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "vnc",
--          "type": "428"
-+          "type": "429"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "427"
-+          "type": "428"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "142",
-+      "name": "143",
-       "members": [
-         {
-           "name": "protocol",
-@@ -5628,27 +5663,27 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "143",
-+      "name": "144",
-       "members": [
-         {
-           "name": "status",
-           "default": null,
--          "type": "429"
-+          "type": "430"
-         },
-         {
-           "name": "ram",
-           "default": null,
--          "type": "430"
-+          "type": "431"
-         },
-         {
-           "name": "vfio",
-           "default": null,
--          "type": "431"
-+          "type": "432"
-         },
-         {
-           "name": "xbzrle-cache",
-           "default": null,
--          "type": "432"
-+          "type": "433"
-         },
-         {
-           "name": "total-time",
-@@ -5698,7 +5733,7 @@
-         {
-           "name": "socket-address",
-           "default": null,
--          "type": "[391]"
-+          "type": "[392]"
-         },
-         {
-           "name": "dirty-limit-throttle-time-per-round",
-@@ -5714,26 +5749,26 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "144",
-+      "name": "145",
-       "members": [
-         {
-           "name": "capabilities",
--          "type": "[145]"
-+          "type": "[146]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[145]",
--      "element-type": "145",
-+      "name": "[146]",
-+      "element-type": "146",
-       "meta-type": "array"
-     },
-     {
--      "name": "145",
-+      "name": "146",
-       "members": [
-         {
-           "name": "capability",
--          "type": "433"
-+          "type": "434"
-         },
-         {
-           "name": "state",
-@@ -5743,7 +5778,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "146",
-+      "name": "147",
-       "members": [
-         {
-           "name": "announce-initial",
-@@ -5788,17 +5823,17 @@
-         {
-           "name": "tls-creds",
-           "default": null,
--          "type": "359"
-+          "type": "360"
-         },
-         {
-           "name": "tls-hostname",
-           "default": null,
--          "type": "359"
-+          "type": "360"
-         },
-         {
-           "name": "tls-authz",
-           "default": null,
--          "type": "359"
-+          "type": "360"
-         },
-         {
-           "name": "max-bandwidth",
-@@ -5846,7 +5881,7 @@
-         {
-           "name": "multifd-compression",
-           "default": null,
--          "type": "434"
-+          "type": "435"
-         },
-         {
-           "name": "multifd-zlib-level",
-@@ -5866,7 +5901,7 @@
-         {
-           "name": "block-bitmap-mapping",
-           "default": null,
--          "type": "[435]"
-+          "type": "[436]"
-         },
-         {
-           "name": "x-vcpu-dirty-limit-period",
-@@ -5884,12 +5919,12 @@
-         {
-           "name": "mode",
-           "default": null,
--          "type": "436"
-+          "type": "437"
-         },
-         {
-           "name": "zero-page-detection",
-           "default": null,
--          "type": "437"
-+          "type": "438"
-         },
-         {
-           "name": "direct-io",
-@@ -5900,7 +5935,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "147",
-+      "name": "148",
-       "members": [
-         {
-           "name": "announce-initial",
-@@ -6003,7 +6038,7 @@
-         {
-           "name": "multifd-compression",
-           "default": null,
--          "type": "434"
-+          "type": "435"
-         },
-         {
-           "name": "multifd-zlib-level",
-@@ -6023,7 +6058,7 @@
-         {
-           "name": "block-bitmap-mapping",
-           "default": null,
--          "type": "[435]"
-+          "type": "[436]"
-         },
-         {
-           "name": "x-vcpu-dirty-limit-period",
-@@ -6041,12 +6076,12 @@
-         {
-           "name": "mode",
-           "default": null,
--          "type": "436"
-+          "type": "437"
-         },
-         {
-           "name": "zero-page-detection",
-           "default": null,
--          "type": "437"
-+          "type": "438"
-         },
-         {
-           "name": "direct-io",
-@@ -6057,17 +6092,17 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "148",
-+      "name": "149",
-       "members": [
-         {
-           "name": "status",
--          "type": "429"
-+          "type": "430"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "149",
-+      "name": "150",
-       "members": [
-         {
-           "name": "pass",
-@@ -6077,31 +6112,31 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "150",
-+      "name": "151",
-       "members": [
-         {
-           "name": "mode",
--          "type": "438"
-+          "type": "439"
-         },
-         {
-           "name": "reason",
--          "type": "439"
-+          "type": "440"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "151",
-+      "name": "152",
-       "members": [
-         {
-           "name": "state",
--          "type": "429"
-+          "type": "430"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "152",
-+      "name": "153",
-       "members": [
-         {
-           "name": "uri",
-@@ -6111,7 +6146,7 @@
-         {
-           "name": "channels",
-           "default": null,
--          "type": "[440]"
-+          "type": "[441]"
-         },
-         {
-           "name": "detach",
-@@ -6127,7 +6162,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "153",
-+      "name": "154",
-       "members": [
-         {
-           "name": "uri",
-@@ -6137,7 +6172,7 @@
-         {
-           "name": "channels",
-           "default": null,
--          "type": "[440]"
-+          "type": "[441]"
-         },
-         {
-           "name": "exit-on-error",
-@@ -6148,7 +6183,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "154",
-+      "name": "155",
-       "members": [
-         {
-           "name": "filename",
-@@ -6163,7 +6198,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "155",
-+      "name": "156",
-       "members": [
-         {
-           "name": "enable",
-@@ -6173,7 +6208,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "156",
-+      "name": "157",
-       "members": [
-         {
-           "name": "filename",
-@@ -6183,7 +6218,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "157",
-+      "name": "158",
-       "members": [
-         {
-           "name": "enable",
-@@ -6202,7 +6237,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "158",
-+      "name": "159",
-       "members": [
-         {
-           "name": "error",
-@@ -6217,25 +6252,25 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "159",
-+      "name": "160",
-       "members": [
-         {
-           "name": "mode",
--          "type": "438"
-+          "type": "439"
-         },
-         {
-           "name": "last-mode",
--          "type": "438"
-+          "type": "439"
-         },
-         {
-           "name": "reason",
--          "type": "439"
-+          "type": "440"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "160",
-+      "name": "161",
-       "members": [
-         {
-           "name": "uri",
-@@ -6245,7 +6280,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "161",
-+      "name": "162",
-       "members": [
-         {
-           "name": "device-id",
-@@ -6255,7 +6290,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "162",
-+      "name": "163",
-       "members": [
-         {
-           "name": "calc-time",
-@@ -6264,7 +6299,7 @@
-         {
-           "name": "calc-time-unit",
-           "default": null,
--          "type": "441"
-+          "type": "442"
-         },
-         {
-           "name": "sample-pages",
-@@ -6274,24 +6309,24 @@
-         {
-           "name": "mode",
-           "default": null,
--          "type": "442"
-+          "type": "443"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "163",
-+      "name": "164",
-       "members": [
-         {
-           "name": "calc-time-unit",
-           "default": null,
--          "type": "441"
-+          "type": "442"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "164",
-+      "name": "165",
-       "members": [
-         {
-           "name": "dirty-rate",
-@@ -6300,7 +6335,7 @@
-         },
-         {
-           "name": "status",
--          "type": "443"
-+          "type": "444"
-         },
-         {
-           "name": "start-time",
-@@ -6312,7 +6347,7 @@
-         },
-         {
-           "name": "calc-time-unit",
--          "type": "441"
-+          "type": "442"
-         },
-         {
-           "name": "sample-pages",
-@@ -6320,18 +6355,18 @@
-         },
-         {
-           "name": "mode",
--          "type": "442"
-+          "type": "443"
-         },
-         {
-           "name": "vcpu-dirty-rate",
-           "default": null,
--          "type": "[444]"
-+          "type": "[445]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "165",
-+      "name": "166",
-       "members": [
-         {
-           "name": "cpu-index",
-@@ -6346,7 +6381,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "166",
-+      "name": "167",
-       "members": [
-         {
-           "name": "cpu-index",
-@@ -6357,12 +6392,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[167]",
--      "element-type": "167",
-+      "name": "[168]",
-+      "element-type": "168",
-       "meta-type": "array"
-     },
-     {
--      "name": "167",
-+      "name": "168",
-       "members": [
-         {
-           "name": "cpu-index",
-@@ -6380,12 +6415,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[168]",
--      "element-type": "168",
-+      "name": "[169]",
-+      "element-type": "169",
-       "meta-type": "array"
-     },
-     {
--      "name": "168",
-+      "name": "169",
-       "members": [
-         {
-           "name": "name",
-@@ -6399,7 +6434,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "169",
-+      "name": "170",
-       "members": [
-         {
-           "name": "job-id",
-@@ -6421,7 +6456,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "170",
-+      "name": "171",
-       "members": [
-         {
-           "name": "job-id",
-@@ -6443,7 +6478,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "171",
-+      "name": "172",
-       "members": [
-         {
-           "name": "job-id",
-@@ -6461,22 +6496,22 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "172",
-+      "name": "173",
-       "members": [
-         {
-           "name": "actions",
--          "type": "[445]"
-+          "type": "[446]"
-         },
-         {
-           "name": "properties",
-           "default": null,
--          "type": "446"
-+          "type": "447"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "173",
-+      "name": "174",
-       "members": [
-         {
-           "name": "name",
-@@ -6486,12 +6521,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[174]",
--      "element-type": "174",
-+      "name": "[175]",
-+      "element-type": "175",
-       "meta-type": "array"
-     },
-     {
--      "name": "174",
-+      "name": "175",
-       "members": [
-         {
-           "name": "name",
-@@ -6499,13 +6534,13 @@
-         },
-         {
-           "name": "state",
--          "type": "447"
-+          "type": "448"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "175",
-+      "name": "176",
-       "members": [
-         {
-           "name": "name",
-@@ -6524,22 +6559,22 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "176",
-+      "name": "177",
-       "members": [
-         {
-           "name": "enable",
-           "default": null,
--          "type": "[448]"
-+          "type": "[449]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "177",
-+      "name": "178",
-       "members": [
-         {
-           "name": "qemu",
--          "type": "449"
-+          "type": "450"
-         },
-         {
-           "name": "package",
-@@ -6549,12 +6584,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[178]",
--      "element-type": "178",
-+      "name": "[179]",
-+      "element-type": "179",
-       "meta-type": "array"
-     },
-     {
--      "name": "178",
-+      "name": "179",
-       "members": [
-         {
-           "name": "name",
-@@ -6564,41 +6599,41 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[179]",
--      "element-type": "179",
-+      "name": "[180]",
-+      "element-type": "180",
-       "meta-type": "array"
-     },
-     {
--      "name": "179",
-+      "name": "180",
-       "tag": "meta-type",
-       "variants": [
-         {
-           "case": "builtin",
--          "type": "451"
-+          "type": "452"
-         },
-         {
-           "case": "enum",
--          "type": "452"
-+          "type": "453"
-         },
-         {
-           "case": "array",
--          "type": "453"
-+          "type": "454"
-         },
-         {
-           "case": "object",
--          "type": "454"
-+          "type": "455"
-         },
-         {
-           "case": "alternate",
--          "type": "455"
-+          "type": "456"
-         },
-         {
-           "case": "command",
--          "type": "456"
-+          "type": "457"
-         },
-         {
-           "case": "event",
--          "type": "457"
-+          "type": "458"
-         }
-       ],
-       "members": [
-@@ -6608,7 +6643,7 @@
-         },
-         {
-           "name": "meta-type",
--          "type": "450"
-+          "type": "451"
-         },
-         {
-           "name": "features",
-@@ -6619,7 +6654,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "180",
-+      "name": "181",
-       "members": [
-         {
-           "name": "path",
-@@ -6629,12 +6664,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[181]",
--      "element-type": "181",
-+      "name": "[182]",
-+      "element-type": "182",
-       "meta-type": "array"
-     },
-     {
--      "name": "181",
-+      "name": "182",
-       "members": [
-         {
-           "name": "name",
-@@ -6658,7 +6693,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "182",
-+      "name": "183",
-       "members": [
-         {
-           "name": "path",
-@@ -6677,7 +6712,7 @@
-       "meta-type": "builtin"
-     },
-     {
--      "name": "183",
-+      "name": "184",
-       "members": [
-         {
-           "name": "path",
-@@ -6695,7 +6730,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "184",
-+      "name": "185",
-       "members": [
-         {
-           "name": "implements",
-@@ -6711,12 +6746,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[185]",
--      "element-type": "185",
-+      "name": "[186]",
-+      "element-type": "186",
-       "meta-type": "array"
-     },
-     {
--      "name": "185",
-+      "name": "186",
-       "members": [
-         {
-           "name": "name",
-@@ -6736,7 +6771,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "186",
-+      "name": "187",
-       "members": [
-         {
-           "name": "typename",
-@@ -6746,192 +6781,192 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "187",
-+      "name": "188",
-       "tag": "qom-type",
-       "variants": [
-         {
-           "case": "acpi-generic-initiator",
--          "type": "459"
-+          "type": "460"
-         },
-         {
-           "case": "acpi-generic-port",
--          "type": "460"
-+          "type": "461"
-         },
-         {
-           "case": "authz-list",
--          "type": "461"
-+          "type": "462"
-         },
-         {
-           "case": "authz-listfile",
--          "type": "462"
-+          "type": "463"
-         },
-         {
-           "case": "authz-pam",
--          "type": "463"
-+          "type": "464"
-         },
-         {
-           "case": "authz-simple",
--          "type": "464"
-+          "type": "465"
-         },
-         {
-           "case": "can-host-socketcan",
--          "type": "465"
-+          "type": "466"
-         },
-         {
-           "case": "colo-compare",
--          "type": "466"
-+          "type": "467"
-         },
-         {
-           "case": "cryptodev-backend",
--          "type": "467"
-+          "type": "468"
-         },
-         {
-           "case": "cryptodev-backend-builtin",
--          "type": "467"
-+          "type": "468"
-         },
-         {
-           "case": "cryptodev-backend-lkcf",
--          "type": "467"
-+          "type": "468"
-         },
-         {
-           "case": "cryptodev-vhost-user",
--          "type": "468"
-+          "type": "469"
-         },
-         {
-           "case": "dbus-vmstate",
--          "type": "469"
-+          "type": "470"
-         },
-         {
-           "case": "filter-buffer",
--          "type": "470"
-+          "type": "471"
-         },
-         {
-           "case": "filter-dump",
--          "type": "471"
-+          "type": "472"
-         },
-         {
-           "case": "filter-mirror",
--          "type": "472"
-+          "type": "473"
-         },
-         {
-           "case": "filter-redirector",
--          "type": "473"
-+          "type": "474"
-         },
-         {
-           "case": "filter-replay",
--          "type": "474"
-+          "type": "475"
-         },
-         {
-           "case": "filter-rewriter",
--          "type": "475"
-+          "type": "476"
-         },
-         {
-           "case": "input-barrier",
--          "type": "476"
-+          "type": "477"
-         },
-         {
-           "case": "input-linux",
--          "type": "477"
-+          "type": "478"
-         },
-         {
-           "case": "iommufd",
--          "type": "478"
-+          "type": "479"
-         },
-         {
-           "case": "iothread",
--          "type": "479"
-+          "type": "480"
-         },
-         {
-           "case": "main-loop",
--          "type": "480"
-+          "type": "481"
-         },
-         {
-           "case": "memory-backend-epc",
--          "type": "481"
-+          "type": "482"
-         },
-         {
-           "case": "memory-backend-file",
--          "type": "482"
-+          "type": "483"
-         },
-         {
-           "case": "memory-backend-memfd",
--          "type": "483"
-+          "type": "484"
-         },
-         {
-           "case": "memory-backend-ram",
--          "type": "484"
-+          "type": "485"
-         },
-         {
-           "case": "memory-backend-shm",
--          "type": "485"
-+          "type": "486"
-         },
-         {
-           "case": "pr-manager-helper",
--          "type": "486"
-+          "type": "487"
-         },
-         {
-           "case": "qtest",
--          "type": "487"
-+          "type": "488"
-         },
-         {
-           "case": "rng-builtin",
--          "type": "488"
-+          "type": "489"
-         },
-         {
-           "case": "rng-egd",
--          "type": "489"
-+          "type": "490"
-         },
-         {
-           "case": "rng-random",
--          "type": "490"
-+          "type": "491"
-         },
-         {
-           "case": "secret",
--          "type": "491"
-+          "type": "492"
-         },
-         {
-           "case": "secret_keyring",
--          "type": "492"
-+          "type": "493"
-         },
-         {
-           "case": "sev-guest",
--          "type": "493"
-+          "type": "494"
-         },
-         {
-           "case": "sev-snp-guest",
--          "type": "494"
-+          "type": "495"
-         },
-         {
-           "case": "thread-context",
--          "type": "495"
-+          "type": "496"
-         },
-         {
-           "case": "throttle-group",
--          "type": "496"
-+          "type": "497"
-         },
-         {
-           "case": "tls-creds-anon",
--          "type": "497"
-+          "type": "498"
-         },
-         {
-           "case": "tls-creds-psk",
--          "type": "498"
-+          "type": "499"
-         },
-         {
-           "case": "tls-creds-x509",
--          "type": "499"
-+          "type": "500"
-         },
-         {
-           "case": "tls-cipher-suites",
--          "type": "500"
-+          "type": "501"
-         },
-         {
-           "case": "x-remote-object",
--          "type": "501"
-+          "type": "502"
-         },
-         {
-           "case": "x-vfio-user-server",
--          "type": "502"
-+          "type": "503"
-         },
-         {
-           "case": "can-bus",
-@@ -6949,7 +6984,7 @@
-       "members": [
-         {
-           "name": "qom-type",
--          "type": "458"
-+          "type": "459"
-         },
-         {
-           "name": "id",
-@@ -6959,7 +6994,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "188",
-+      "name": "189",
-       "members": [
-         {
-           "name": "id",
-@@ -6969,7 +7004,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "189",
-+      "name": "190",
-       "members": [
-         {
-           "name": "typename",
-@@ -6979,7 +7014,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "190",
-+      "name": "191",
-       "members": [
-         {
-           "name": "driver",
-@@ -6999,7 +7034,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "191",
-+      "name": "192",
-       "members": [
-         {
-           "name": "id",
-@@ -7009,7 +7044,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "192",
-+      "name": "193",
-       "members": [
-         {
-           "name": "device",
-@@ -7024,7 +7059,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "193",
-+      "name": "194",
-       "members": [
-         {
-           "name": "device",
-@@ -7039,7 +7074,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "194",
-+      "name": "195",
-       "members": [
-         {
-           "name": "id",
-@@ -7049,17 +7084,17 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[195]",
--      "element-type": "195",
-+      "name": "[196]",
-+      "element-type": "196",
-       "meta-type": "array"
-     },
-     {
--      "name": "195",
-+      "name": "196",
-       "tag": "target",
-       "variants": [
-         {
-           "case": "s390x",
--          "type": "505"
-+          "type": "506"
-         },
-         {
-           "case": "aarch64",
-@@ -7190,17 +7225,17 @@
-         {
-           "name": "props",
-           "default": null,
--          "type": "503"
-+          "type": "504"
-         },
-         {
-           "name": "target",
--          "type": "504"
-+          "type": "505"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "196",
-+      "name": "197",
-       "members": [
-         {
-           "name": "compat-props",
-@@ -7214,12 +7249,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[197]",
--      "element-type": "197",
-+      "name": "[198]",
-+      "element-type": "198",
-       "meta-type": "array"
-     },
-     {
--      "name": "197",
-+      "name": "198",
-       "members": [
-         {
-           "name": "name",
-@@ -7268,7 +7303,7 @@
-         {
-           "name": "compat-props",
-           "default": null,
--          "type": "[506]",
-+          "type": "[507]",
-           "features": [
-             "unstable"
-           ]
-@@ -7277,7 +7312,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "198",
-+      "name": "199",
-       "members": [
-         {
-           "name": "wakeup-suspend-support",
-@@ -7287,17 +7322,17 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "199",
-+      "name": "200",
-       "members": [
-         {
-           "name": "arch",
--          "type": "504"
-+          "type": "505"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "200",
-+      "name": "201",
-       "members": [
-         {
-           "name": "UUID",
-@@ -7307,7 +7342,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "201",
-+      "name": "202",
-       "members": [
-         {
-           "name": "guid",
-@@ -7317,7 +7352,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "202",
-+      "name": "203",
-       "members": [
-         {
-           "name": "enabled",
-@@ -7331,7 +7366,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "203",
-+      "name": "204",
-       "members": [
-         {
-           "name": "val",
-@@ -7354,7 +7389,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "204",
-+      "name": "205",
-       "members": [
-         {
-           "name": "val",
-@@ -7372,12 +7407,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[205]",
--      "element-type": "205",
-+      "name": "[206]",
-+      "element-type": "206",
-       "meta-type": "array"
-     },
-     {
--      "name": "205",
-+      "name": "206",
-       "members": [
-         {
-           "name": "id",
-@@ -7415,18 +7450,18 @@
-         },
-         {
-           "name": "policy",
--          "type": "507"
-+          "type": "508"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[206]",
--      "element-type": "206",
-+      "name": "[207]",
-+      "element-type": "207",
-       "meta-type": "array"
-     },
-     {
--      "name": "206",
-+      "name": "207",
-       "members": [
-         {
-           "name": "type",
-@@ -7438,7 +7473,7 @@
-         },
-         {
-           "name": "props",
--          "type": "503"
-+          "type": "504"
-         },
-         {
-           "name": "qom-path",
-@@ -7449,40 +7484,40 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "207",
-+      "name": "208",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "node",
--          "type": "509"
-+          "type": "510"
-         },
-         {
-           "case": "dist",
--          "type": "510"
-+          "type": "511"
-         },
-         {
-           "case": "cpu",
--          "type": "511"
-+          "type": "512"
-         },
-         {
-           "case": "hmat-lb",
--          "type": "512"
-+          "type": "513"
-         },
-         {
-           "case": "hmat-cache",
--          "type": "513"
-+          "type": "514"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "508"
-+          "type": "509"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "208",
-+      "name": "209",
-       "members": [
-         {
-           "name": "value",
-@@ -7492,7 +7527,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "209",
-+      "name": "210",
-       "members": [
-         {
-           "name": "actual",
-@@ -7502,7 +7537,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "210",
-+      "name": "211",
-       "members": [
-         {
-           "name": "actual",
-@@ -7512,7 +7547,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "211",
-+      "name": "212",
-       "members": [
-         {
-           "name": "committed",
-@@ -7526,7 +7561,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "212",
-+      "name": "213",
-       "members": [
-         {
-           "name": "base-memory",
-@@ -7541,49 +7576,49 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[213]",
--      "element-type": "213",
-+      "name": "[214]",
-+      "element-type": "214",
-       "meta-type": "array"
-     },
-     {
--      "name": "213",
-+      "name": "214",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "dimm",
--          "type": "515"
-+          "type": "516"
-         },
-         {
-           "case": "nvdimm",
--          "type": "515"
-+          "type": "516"
-         },
-         {
-           "case": "virtio-pmem",
--          "type": "516"
-+          "type": "517"
-         },
-         {
-           "case": "virtio-mem",
--          "type": "517"
-+          "type": "518"
-         },
-         {
-           "case": "sgx-epc",
--          "type": "518"
-+          "type": "519"
-         },
-         {
-           "case": "hv-balloon",
--          "type": "519"
-+          "type": "520"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "514"
-+          "type": "515"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "214",
-+      "name": "215",
-       "members": [
-         {
-           "name": "id",
-@@ -7602,7 +7637,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "215",
-+      "name": "216",
-       "members": [
-         {
-           "name": "human-readable-text",
-@@ -7612,7 +7647,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "216",
-+      "name": "217",
-       "members": [
-         {
-           "name": "filename",
-@@ -7622,36 +7657,36 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "221",
-+      "name": "222",
-       "members": [
-         {
-           "name": "type",
--          "type": "522"
-+          "type": "523"
-         },
-         {
-           "name": "model",
--          "type": "520"
-+          "type": "521"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "222",
-+      "name": "223",
-       "members": [
-         {
-           "name": "model",
--          "type": "520"
-+          "type": "521"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[223]",
--      "element-type": "223",
-+      "name": "[224]",
-+      "element-type": "224",
-       "meta-type": "array"
-     },
-     {
--      "name": "223",
-+      "name": "224",
-       "members": [
-         {
-           "name": "name",
-@@ -7688,11 +7723,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "227",
-+      "name": "228",
-       "members": [
-         {
-           "name": "mode",
--          "type": "525"
-+          "type": "526"
-         },
-         {
-           "name": "filename",
-@@ -7707,7 +7742,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "228",
-+      "name": "229",
-       "members": [
-         {
-           "name": "icount",
-@@ -7717,7 +7752,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "229",
-+      "name": "230",
-       "members": [
-         {
-           "name": "icount",
-@@ -7727,31 +7762,31 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "230",
-+      "name": "231",
-       "members": [
-         {
-           "name": "instances",
--          "type": "[231]"
-+          "type": "[232]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[231]",
--      "element-type": "231",
-+      "name": "[232]",
-+      "element-type": "232",
-       "meta-type": "array"
-     },
-     {
--      "name": "231",
-+      "name": "232",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "block-node",
--          "type": "527"
-+          "type": "528"
-         },
-         {
-           "case": "chardev",
--          "type": "528"
-+          "type": "529"
-         },
-         {
-           "case": "migration",
-@@ -7761,13 +7796,13 @@
-       "members": [
-         {
-           "name": "type",
--          "type": "526"
-+          "type": "527"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "232",
-+      "name": "233",
-       "members": [
-         {
-           "name": "protocol",
-@@ -7791,7 +7826,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "233",
-+      "name": "234",
-       "members": [
-         {
-           "name": "name",
-@@ -7802,12 +7837,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[234]",
--      "element-type": "234",
-+      "name": "[235]",
-+      "element-type": "235",
-       "meta-type": "array"
-     },
-     {
--      "name": "234",
-+      "name": "235",
-       "members": [
-         {
-           "name": "id",
-@@ -7837,7 +7872,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "235",
-+      "name": "236",
-       "members": [
-         {
-           "name": "command-line",
-@@ -7852,7 +7887,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "236",
-+      "name": "237",
-       "members": [
-         {
-           "name": "fdname",
-@@ -7862,7 +7897,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "238",
-+      "name": "239",
-       "members": [
-         {
-           "name": "fdname",
-@@ -7872,7 +7907,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "239",
-+      "name": "240",
-       "members": [
-         {
-           "name": "fdset-id",
-@@ -7888,7 +7923,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "240",
-+      "name": "241",
-       "members": [
-         {
-           "name": "fdset-id",
-@@ -7902,7 +7937,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "241",
-+      "name": "242",
-       "members": [
-         {
-           "name": "fdset-id",
-@@ -7917,12 +7952,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[242]",
--      "element-type": "242",
-+      "name": "[243]",
-+      "element-type": "243",
-       "meta-type": "array"
-     },
-     {
--      "name": "242",
-+      "name": "243",
-       "members": [
-         {
-           "name": "fdset-id",
-@@ -7930,13 +7965,13 @@
-         },
-         {
-           "name": "fds",
--          "type": "[529]"
-+          "type": "[530]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "243",
-+      "name": "244",
-       "members": [
-         {
-           "name": "option",
-@@ -7947,12 +7982,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[244]",
--      "element-type": "244",
-+      "name": "[245]",
-+      "element-type": "245",
-       "meta-type": "array"
-     },
-     {
--      "name": "244",
-+      "name": "245",
-       "members": [
-         {
-           "name": "option",
-@@ -7960,13 +7995,13 @@
-         },
-         {
-           "name": "parameters",
--          "type": "[530]"
-+          "type": "[531]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "245",
-+      "name": "246",
-       "members": [
-         {
-           "name": "offset",
-@@ -7980,7 +8015,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "246",
-+      "name": "247",
-       "members": [
-         {
-           "name": "vfu-id",
-@@ -8002,16 +8037,16 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "247",
-+      "name": "248",
-       "tag": "sev-type",
-       "variants": [
-         {
-           "case": "sev",
--          "type": "533"
-+          "type": "534"
-         },
-         {
-           "case": "sev-snp",
--          "type": "534"
-+          "type": "535"
-         }
-       ],
-       "members": [
-@@ -8033,17 +8068,17 @@
-         },
-         {
-           "name": "state",
--          "type": "531"
-+          "type": "532"
-         },
-         {
-           "name": "sev-type",
--          "type": "532"
-+          "type": "533"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "248",
-+      "name": "249",
-       "members": [
-         {
-           "name": "data",
-@@ -8053,7 +8088,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "249",
-+      "name": "250",
-       "members": [
-         {
-           "name": "pdh",
-@@ -8079,7 +8114,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "250",
-+      "name": "251",
-       "members": [
-         {
-           "name": "packet-header",
-@@ -8098,7 +8133,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "251",
-+      "name": "252",
-       "members": [
-         {
-           "name": "mnonce",
-@@ -8108,7 +8143,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "252",
-+      "name": "253",
-       "members": [
-         {
-           "name": "data",
-@@ -8118,7 +8153,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "255",
-+      "name": "256",
-       "members": [
-         {
-           "name": "sgx",
-@@ -8138,18 +8173,18 @@
-         },
-         {
-           "name": "sections",
--          "type": "[535]"
-+          "type": "[536]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[256]",
--      "element-type": "256",
-+      "name": "[257]",
-+      "element-type": "257",
-       "meta-type": "array"
-     },
-     {
--      "name": "256",
-+      "name": "257",
-       "members": [
-         {
-           "name": "port",
-@@ -8161,7 +8196,7 @@
-         },
-         {
-           "name": "type",
--          "type": "536"
-+          "type": "537"
-         },
-         {
-           "name": "remote-domain",
-@@ -8183,7 +8218,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "257",
-+      "name": "258",
-       "members": [
-         {
-           "name": "port",
-@@ -8193,45 +8228,45 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[258]",
--      "element-type": "258",
-+      "name": "[259]",
-+      "element-type": "259",
-       "meta-type": "array"
-     },
-     {
--      "name": "258",
-+      "name": "259",
-       "tag": "driver",
-       "variants": [
-         {
-           "case": "none",
--          "type": "538"
-+          "type": "539"
-         },
-         {
-           "case": "alsa",
--          "type": "539"
-+          "type": "540"
-         },
-         {
-           "case": "dbus",
--          "type": "541"
-+          "type": "542"
-         },
-         {
-           "case": "oss",
--          "type": "544"
-+          "type": "545"
-         },
-         {
-           "case": "pa",
--          "type": "545"
-+          "type": "546"
-         },
-         {
-           "case": "sdl",
--          "type": "547"
-+          "type": "548"
-         },
-         {
-           "case": "spice",
--          "type": "538"
-+          "type": "539"
-         },
-         {
-           "case": "wav",
--          "type": "549"
-+          "type": "550"
-         }
-       ],
-       "members": [
-@@ -8241,7 +8276,7 @@
-         },
-         {
-           "name": "driver",
--          "type": "537"
-+          "type": "538"
-         },
-         {
-           "name": "timer-period",
-@@ -8252,12 +8287,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[259]",
--      "element-type": "259",
-+      "name": "[260]",
-+      "element-type": "260",
-       "meta-type": "array"
-     },
-     {
--      "name": "259",
-+      "name": "260",
-       "members": [
-         {
-           "name": "device",
-@@ -8270,7 +8305,7 @@
-         },
-         {
-           "name": "slot-type",
--          "type": "550"
-+          "type": "551"
-         },
-         {
-           "name": "source",
-@@ -8284,22 +8319,22 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "260",
-+      "name": "261",
-       "members": [
-         {
-           "name": "info",
--          "type": "259"
-+          "type": "260"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[261]",
--      "element-type": "261",
-+      "name": "[262]",
-+      "element-type": "262",
-       "meta-type": "array"
-     },
-     {
--      "name": "261",
-+      "name": "262",
-       "members": [
-         {
-           "name": "bus",
-@@ -8307,18 +8342,18 @@
-         },
-         {
-           "name": "devices",
--          "type": "[551]"
-+          "type": "[552]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "262",
-+      "name": "263",
-       "tag": "target",
-       "variants": [
-         {
-           "case": "vcpu",
--          "type": "554"
-+          "type": "555"
-         },
-         {
-           "case": "vm",
-@@ -8332,27 +8367,27 @@
-       "members": [
-         {
-           "name": "target",
--          "type": "552"
-+          "type": "553"
-         },
-         {
-           "name": "providers",
-           "default": null,
--          "type": "[553]"
-+          "type": "[554]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[263]",
--      "element-type": "263",
-+      "name": "[264]",
-+      "element-type": "264",
-       "meta-type": "array"
-     },
-     {
--      "name": "263",
-+      "name": "264",
-       "members": [
-         {
-           "name": "provider",
--          "type": "555"
-+          "type": "556"
-         },
-         {
-           "name": "qom-path",
-@@ -8361,52 +8396,52 @@
-         },
-         {
-           "name": "stats",
--          "type": "[556]"
-+          "type": "[557]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "264",
-+      "name": "265",
-       "members": [
-         {
-           "name": "provider",
-           "default": null,
--          "type": "555"
-+          "type": "556"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[265]",
--      "element-type": "265",
-+      "name": "[266]",
-+      "element-type": "266",
-       "meta-type": "array"
-     },
-     {
--      "name": "265",
-+      "name": "266",
-       "members": [
-         {
-           "name": "provider",
--          "type": "555"
-+          "type": "556"
-         },
-         {
-           "name": "target",
--          "type": "552"
-+          "type": "553"
-         },
-         {
-           "name": "stats",
--          "type": "[557]"
-+          "type": "[558]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[266]",
--      "element-type": "266",
-+      "name": "[267]",
-+      "element-type": "267",
-       "meta-type": "array"
-     },
-     {
--      "name": "266",
-+      "name": "267",
-       "members": [
-         {
-           "name": "path",
-@@ -8420,7 +8455,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "267",
-+      "name": "268",
-       "members": [
-         {
-           "name": "path",
-@@ -8430,7 +8465,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "268",
-+      "name": "269",
-       "members": [
-         {
-           "name": "name",
-@@ -8450,15 +8485,15 @@
-         },
-         {
-           "name": "guest-features",
--          "type": "558"
-+          "type": "559"
-         },
-         {
-           "name": "host-features",
--          "type": "558"
-+          "type": "559"
-         },
-         {
-           "name": "backend-features",
--          "type": "558"
-+          "type": "559"
-         },
-         {
-           "name": "num-vqs",
-@@ -8466,7 +8501,7 @@
-         },
-         {
-           "name": "status",
--          "type": "559"
-+          "type": "560"
-         },
-         {
-           "name": "isr",
-@@ -8515,13 +8550,13 @@
-         {
-           "name": "vhost-dev",
-           "default": null,
--          "type": "560"
-+          "type": "561"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "269",
-+      "name": "270",
-       "members": [
-         {
-           "name": "path",
-@@ -8535,7 +8570,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "270",
-+      "name": "271",
-       "members": [
-         {
-           "name": "name",
-@@ -8599,7 +8634,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "271",
-+      "name": "272",
-       "members": [
-         {
-           "name": "path",
-@@ -8613,7 +8648,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "272",
-+      "name": "273",
-       "members": [
-         {
-           "name": "name",
-@@ -8671,7 +8706,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "273",
-+      "name": "274",
-       "members": [
-         {
-           "name": "path",
-@@ -8690,7 +8725,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "274",
-+      "name": "275",
-       "members": [
-         {
-           "name": "name",
-@@ -8702,21 +8737,21 @@
-         },
-         {
-           "name": "descs",
--          "type": "[561]"
-+          "type": "[562]"
-         },
-         {
-           "name": "avail",
--          "type": "562"
-+          "type": "563"
-         },
-         {
-           "name": "used",
--          "type": "563"
-+          "type": "564"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "275",
-+      "name": "276",
-       "members": [
-         {
-           "name": "device-id",
-@@ -8728,18 +8763,18 @@
-         },
-         {
-           "name": "device-state",
--          "type": "564"
-+          "type": "565"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[276]",
--      "element-type": "276",
-+      "name": "[277]",
-+      "element-type": "277",
-       "meta-type": "array"
-     },
-     {
--      "name": "276",
-+      "name": "277",
-       "members": [
-         {
-           "name": "id",
-@@ -8747,17 +8782,17 @@
-         },
-         {
-           "name": "service",
--          "type": "[565]"
-+          "type": "[566]"
-         },
-         {
-           "name": "client",
--          "type": "[566]"
-+          "type": "[567]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "277",
-+      "name": "278",
-       "members": [
-         {
-           "name": "path",
-@@ -8765,7 +8800,7 @@
-         },
-         {
-           "name": "log",
--          "type": "567"
-+          "type": "568"
-         },
-         {
-           "name": "flags",
-@@ -8811,7 +8846,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "278",
-+      "name": "279",
-       "members": [
-         {
-           "name": "path",
-@@ -8819,7 +8854,7 @@
-         },
-         {
-           "name": "log",
--          "type": "567"
-+          "type": "568"
-         },
-         {
-           "name": "flags",
-@@ -8885,7 +8920,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "279",
-+      "name": "280",
-       "members": [
-         {
-           "name": "path",
-@@ -8893,7 +8928,7 @@
-         },
-         {
-           "name": "log",
--          "type": "567"
-+          "type": "568"
-         },
-         {
-           "name": "flags",
-@@ -8939,7 +8974,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "280",
-+      "name": "281",
-       "members": [
-         {
-           "name": "path",
-@@ -8957,7 +8992,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "281",
-+      "name": "282",
-       "members": [
-         {
-           "name": "path",
-@@ -8965,13 +9000,13 @@
-         },
-         {
-           "name": "errors",
--          "type": "[568]"
-+          "type": "[569]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "282",
-+      "name": "283",
-       "members": [
-         {
-           "name": "path",
-@@ -8979,13 +9014,13 @@
-         },
-         {
-           "name": "type",
--          "type": "569"
-+          "type": "570"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "283",
-+      "name": "284",
-       "members": [
-         {
-           "name": "path",
-@@ -8997,7 +9032,7 @@
-         },
-         {
-           "name": "selection-policy",
--          "type": "570"
-+          "type": "571"
-         },
-         {
-           "name": "region",
-@@ -9010,13 +9045,13 @@
-         },
-         {
-           "name": "extents",
--          "type": "[571]"
-+          "type": "[572]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "284",
-+      "name": "285",
-       "members": [
-         {
-           "name": "path",
-@@ -9028,7 +9063,7 @@
-         },
-         {
-           "name": "removal-policy",
--          "type": "572"
-+          "type": "573"
-         },
-         {
-           "name": "forced-removal",
-@@ -9051,7 +9086,7 @@
-         },
-         {
-           "name": "extents",
--          "type": "[571]"
-+          "type": "[572]"
-         }
-       ],
-       "meta-type": "object"
-@@ -9062,7 +9097,7 @@
-       "meta-type": "builtin"
-     },
-     {
--      "name": "285",
-+      "name": "286",
-       "members": [
-         {
-           "name": "debug"
-@@ -9134,7 +9169,7 @@
-       ]
-     },
-     {
--      "name": "286",
-+      "name": "287",
-       "members": [
-         {
-           "name": "none"
-@@ -9186,7 +9221,7 @@
-       ]
-     },
-     {
--      "name": "287",
-+      "name": "288",
-       "members": [
-         {
-           "name": "reset"
-@@ -9222,7 +9257,7 @@
-       ]
-     },
-     {
--      "name": "288",
-+      "name": "289",
-       "members": [
-         {
-           "name": "reset"
-@@ -9238,7 +9273,7 @@
-       ]
-     },
-     {
--      "name": "289",
-+      "name": "290",
-       "members": [
-         {
-           "name": "poweroff"
-@@ -9254,7 +9289,7 @@
-       ]
-     },
-     {
--      "name": "290",
-+      "name": "291",
-       "members": [
-         {
-           "name": "pause"
-@@ -9278,7 +9313,7 @@
-       ]
-     },
-     {
--      "name": "291",
-+      "name": "292",
-       "members": [
-         {
-           "name": "pause"
-@@ -9298,28 +9333,28 @@
-       ]
-     },
-     {
--      "name": "292",
-+      "name": "293",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "hyper-v",
--          "type": "574"
-+          "type": "575"
-         },
-         {
-           "case": "s390",
--          "type": "575"
-+          "type": "576"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "573"
-+          "type": "574"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "293",
-+      "name": "294",
-       "members": [
-         {
-           "name": "hypervisor"
-@@ -9335,7 +9370,7 @@
-       ]
-     },
-     {
--      "name": "294",
-+      "name": "295",
-       "members": [
-         {
-           "name": "ignore"
-@@ -9359,7 +9394,7 @@
-       ]
-     },
-     {
--      "name": "295",
-+      "name": "296",
-       "members": [
-         {
-           "name": "action-required",
-@@ -9373,7 +9408,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "296",
-+      "name": "297",
-       "members": [
-         {
-           "name": "undefined"
-@@ -9425,7 +9460,7 @@
-       ]
-     },
-     {
--      "name": "297",
-+      "name": "298",
-       "members": [
-         {
-           "name": "commit"
-@@ -9474,7 +9509,7 @@
-       "meta-type": "builtin"
-     },
-     {
--      "name": "298",
-+      "name": "299",
-       "members": [
-         {
-           "name": "retain"
-@@ -9499,7 +9534,7 @@
-       "meta-type": "array"
-     },
-     {
--      "name": "299",
-+      "name": "300",
-       "members": [
-         {
-           "name": "ok"
-@@ -9519,7 +9554,7 @@
-       ]
-     },
-     {
--      "name": "300",
-+      "name": "301",
-       "members": [
-         {
-           "name": "rd_bytes",
-@@ -9652,46 +9687,46 @@
-         },
-         {
-           "name": "timed_stats",
--          "type": "[576]"
-+          "type": "[577]"
-         },
-         {
-           "name": "rd_latency_histogram",
-           "default": null,
--          "type": "577"
-+          "type": "578"
-         },
-         {
-           "name": "wr_latency_histogram",
-           "default": null,
--          "type": "577"
-+          "type": "578"
-         },
-         {
-           "name": "zone_append_latency_histogram",
-           "default": null,
--          "type": "577"
-+          "type": "578"
-         },
-         {
-           "name": "flush_latency_histogram",
-           "default": null,
--          "type": "577"
-+          "type": "578"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "301",
-+      "name": "302",
-       "tag": "driver",
-       "variants": [
-         {
-           "case": "file",
--          "type": "578"
-+          "type": "579"
-         },
-         {
-           "case": "host_device",
--          "type": "578"
-+          "type": "579"
-         },
-         {
-           "case": "nvme",
--          "type": "579"
-+          "type": "580"
-         },
-         {
-           "case": "blkdebug",
-@@ -9873,13 +9908,13 @@
-       "members": [
-         {
-           "name": "driver",
--          "type": "317"
-+          "type": "318"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "302",
-+      "name": "303",
-       "members": [
-         {
-           "name": "actively-synced",
-@@ -9889,7 +9924,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "303",
-+      "name": "304",
-       "members": [
-         {
-           "name": "existing"
-@@ -9905,7 +9940,7 @@
-       ]
-     },
-     {
--      "name": "304",
-+      "name": "305",
-       "members": [
-         {
-           "name": "report"
-@@ -9933,7 +9968,7 @@
-       ]
-     },
-     {
--      "name": "305",
-+      "name": "306",
-       "members": [
-         {
-           "name": "top"
-@@ -9961,7 +9996,7 @@
-       ]
-     },
-     {
--      "name": "306",
-+      "name": "307",
-       "members": [
-         {
-           "name": "on-success"
-@@ -9981,7 +10016,7 @@
-       ]
-     },
-     {
--      "name": "307",
-+      "name": "308",
-       "members": [
-         {
-           "name": "use-copy-range",
-@@ -10007,7 +10042,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "308",
-+      "name": "309",
-       "members": [
-         {
-           "name": "off"
-@@ -10027,7 +10062,7 @@
-       ]
-     },
-     {
--      "name": "309",
-+      "name": "310",
-       "members": [
-         {
-           "name": "filename",
-@@ -10084,23 +10119,23 @@
-         {
-           "name": "snapshots",
-           "default": null,
--          "type": "[78]"
-+          "type": "[79]"
-         },
-         {
-           "name": "format-specific",
-           "default": null,
--          "type": "580"
-+          "type": "581"
-         },
-         {
-           "name": "backing-image",
-           "default": null,
--          "type": "309"
-+          "type": "310"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "310",
-+      "name": "311",
-       "members": [
-         {
-           "name": "writeback",
-@@ -10118,12 +10153,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[311]",
--      "element-type": "311",
-+      "name": "[312]",
-+      "element-type": "312",
-       "meta-type": "array"
-     },
-     {
--      "name": "311",
-+      "name": "312",
-       "members": [
-         {
-           "name": "name",
-@@ -10159,12 +10194,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[312]",
--      "element-type": "312",
-+      "name": "[313]",
-+      "element-type": "313",
-       "meta-type": "array"
-     },
-     {
--      "name": "312",
-+      "name": "313",
-       "members": [
-         {
-           "name": "id",
-@@ -10172,7 +10207,7 @@
-         },
-         {
-           "name": "type",
--          "type": "581"
-+          "type": "582"
-         },
-         {
-           "name": "name",
-@@ -10182,12 +10217,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[313]",
--      "element-type": "313",
-+      "name": "[314]",
-+      "element-type": "314",
-       "meta-type": "array"
-     },
-     {
--      "name": "313",
-+      "name": "314",
-       "members": [
-         {
-           "name": "parent",
-@@ -10203,17 +10238,17 @@
-         },
-         {
-           "name": "perm",
--          "type": "[582]"
-+          "type": "[583]"
-         },
-         {
-           "name": "shared-perm",
--          "type": "[582]"
-+          "type": "[583]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "314",
-+      "name": "315",
-       "members": [
-         {
-           "name": "background"
-@@ -10229,12 +10264,12 @@
-       ]
-     },
-     {
--      "name": "[315]",
--      "element-type": "315",
-+      "name": "[316]",
-+      "element-type": "316",
-       "meta-type": "array"
-     },
-     {
--      "name": "315",
-+      "name": "316",
-       "members": [
-         {
-           "type": "str"
-@@ -10246,17 +10281,17 @@
-       "meta-type": "alternate"
-     },
-     {
--      "name": "316",
-+      "name": "317",
-       "members": [
-         {
-           "name": "copy-mode",
--          "type": "314"
-+          "type": "315"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "317",
-+      "name": "318",
-       "members": [
-         {
-           "name": "blkdebug"
-@@ -10455,7 +10490,7 @@
-       ]
-     },
-     {
--      "name": "318",
-+      "name": "319",
-       "members": [
-         {
-           "name": "ignore"
-@@ -10471,7 +10506,7 @@
-       ]
-     },
-     {
--      "name": "319",
-+      "name": "320",
-       "members": [
-         {
-           "name": "direct",
-@@ -10487,11 +10522,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "320",
-+      "name": "321",
-       "members": [
-         {
-           "name": "image",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "config",
-@@ -10531,36 +10566,36 @@
-         {
-           "name": "inject-error",
-           "default": null,
--          "type": "[584]"
-+          "type": "[585]"
-         },
-         {
-           "name": "set-state",
-           "default": null,
--          "type": "[585]"
-+          "type": "[586]"
-         },
-         {
-           "name": "take-child-perms",
-           "default": null,
--          "type": "[582]"
-+          "type": "[583]"
-         },
-         {
-           "name": "unshare-child-perms",
-           "default": null,
--          "type": "[582]"
-+          "type": "[583]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "321",
-+      "name": "322",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "log",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "log-sector-size",
-@@ -10581,49 +10616,49 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "322",
-+      "name": "323",
-       "members": [
-         {
-           "name": "test",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "raw",
--          "type": "583"
-+          "type": "584"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "323",
-+      "name": "324",
-       "members": [
-         {
-           "name": "image",
--          "type": "583"
-+          "type": "584"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "324",
-+      "name": "325",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "325",
-+      "name": "326",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "target",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "bitmap",
-@@ -10633,7 +10668,7 @@
-         {
-           "name": "on-cbw-error",
-           "default": null,
--          "type": "586"
-+          "type": "587"
-         },
-         {
-           "name": "cbw-timeout",
-@@ -10649,11 +10684,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "326",
-+      "name": "327",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "bottom",
-@@ -10664,7 +10699,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "327",
-+      "name": "328",
-       "members": [
-         {
-           "name": "filename",
-@@ -10678,12 +10713,12 @@
-         {
-           "name": "locking",
-           "default": null,
--          "type": "587"
-+          "type": "588"
-         },
-         {
-           "name": "aio",
-           "default": null,
--          "type": "588"
-+          "type": "589"
-         },
-         {
-           "name": "aio-max-batch",
-@@ -10710,7 +10745,7 @@
-       ]
-     },
-     {
--      "name": "328",
-+      "name": "329",
-       "members": [
-         {
-           "name": "url",
-@@ -10750,7 +10785,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "329",
-+      "name": "330",
-       "members": [
-         {
-           "name": "url",
-@@ -10795,7 +10830,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "330",
-+      "name": "331",
-       "members": [
-         {
-           "name": "volume",
-@@ -10807,7 +10842,7 @@
-         },
-         {
-           "name": "server",
--          "type": "[391]"
-+          "type": "[392]"
-         },
-         {
-           "name": "debug",
-@@ -10823,7 +10858,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "331",
-+      "name": "332",
-       "members": [
-         {
-           "name": "url",
-@@ -10873,7 +10908,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "332",
-+      "name": "333",
-       "members": [
-         {
-           "name": "url",
-@@ -10928,7 +10963,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "333",
-+      "name": "334",
-       "members": [
-         {
-           "name": "filename",
-@@ -10938,11 +10973,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "334",
-+      "name": "335",
-       "members": [
-         {
-           "name": "transport",
--          "type": "589"
-+          "type": "590"
-         },
-         {
-           "name": "portal",
-@@ -10975,7 +11010,7 @@
-         {
-           "name": "header-digest",
-           "default": null,
--          "type": "590"
-+          "type": "591"
-         },
-         {
-           "name": "timeout",
-@@ -10986,11 +11021,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "335",
-+      "name": "336",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "key-secret",
-@@ -11000,17 +11035,17 @@
-         {
-           "name": "header",
-           "default": null,
--          "type": "583"
-+          "type": "584"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "336",
-+      "name": "337",
-       "members": [
-         {
-           "name": "server",
--          "type": "391"
-+          "type": "392"
-         },
-         {
-           "name": "export",
-@@ -11049,11 +11084,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "337",
-+      "name": "338",
-       "members": [
-         {
-           "name": "server",
--          "type": "591"
-+          "type": "592"
-         },
-         {
-           "name": "path",
-@@ -11093,7 +11128,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "338",
-+      "name": "339",
-       "members": [
-         {
-           "name": "size",
-@@ -11114,7 +11149,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "339",
-+      "name": "340",
-       "members": [
-         {
-           "name": "device",
-@@ -11128,7 +11163,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "340",
-+      "name": "341",
-       "members": [
-         {
-           "name": "path",
-@@ -11138,11 +11173,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "341",
-+      "name": "342",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "prealloc-align",
-@@ -11158,16 +11193,16 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "342",
-+      "name": "343",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "backing",
-           "default": null,
--          "type": "592"
-+          "type": "593"
-         },
-         {
-           "name": "lazy-refcounts",
-@@ -11197,7 +11232,7 @@
-         {
-           "name": "overlap-check",
-           "default": null,
--          "type": "593"
-+          "type": "594"
-         },
-         {
-           "name": "cache-size",
-@@ -11227,53 +11262,53 @@
-         {
-           "name": "encrypt",
-           "default": null,
--          "type": "594"
-+          "type": "595"
-         },
-         {
-           "name": "data-file",
-           "default": null,
--          "type": "583"
-+          "type": "584"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "343",
-+      "name": "344",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "backing",
-           "default": null,
--          "type": "592"
-+          "type": "593"
-         },
-         {
-           "name": "encrypt",
-           "default": null,
--          "type": "595"
-+          "type": "596"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "344",
-+      "name": "345",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "backing",
-           "default": null,
--          "type": "592"
-+          "type": "593"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "345",
-+      "name": "346",
-       "members": [
-         {
-           "name": "blkverify",
-@@ -11282,7 +11317,7 @@
-         },
-         {
-           "name": "children",
--          "type": "[583]"
-+          "type": "[584]"
-         },
-         {
-           "name": "vote-threshold",
-@@ -11296,17 +11331,17 @@
-         {
-           "name": "read-pattern",
-           "default": null,
--          "type": "596"
-+          "type": "597"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "346",
-+      "name": "347",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "offset",
-@@ -11322,7 +11357,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "347",
-+      "name": "348",
-       "members": [
-         {
-           "name": "pool",
-@@ -11350,7 +11385,7 @@
-         {
-           "name": "encrypt",
-           "default": null,
--          "type": "597"
-+          "type": "598"
-         },
-         {
-           "name": "user",
-@@ -11360,7 +11395,7 @@
-         {
-           "name": "auth-client-required",
-           "default": null,
--          "type": "[598]"
-+          "type": "[599]"
-         },
-         {
-           "name": "key-secret",
-@@ -11370,21 +11405,21 @@
-         {
-           "name": "server",
-           "default": null,
--          "type": "[599]"
-+          "type": "[600]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "348",
-+      "name": "349",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "mode",
--          "type": "600"
-+          "type": "601"
-         },
-         {
-           "name": "top-id",
-@@ -11395,11 +11430,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "349",
-+      "name": "350",
-       "members": [
-         {
-           "name": "server",
--          "type": "601"
-+          "type": "602"
-         },
-         {
-           "name": "path",
-@@ -11413,13 +11448,13 @@
-         {
-           "name": "host-key-check",
-           "default": null,
--          "type": "602"
-+          "type": "603"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "350",
-+      "name": "351",
-       "members": [
-         {
-           "name": "throttle-group",
-@@ -11427,13 +11462,13 @@
-         },
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "351",
-+      "name": "352",
-       "members": [
-         {
-           "name": "path",
-@@ -11443,7 +11478,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "352",
-+      "name": "353",
-       "members": [
-         {
-           "name": "path",
-@@ -11453,7 +11488,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "353",
-+      "name": "354",
-       "members": [
-         {
-           "name": "path",
-@@ -11466,7 +11501,7 @@
-       ]
-     },
-     {
--      "name": "354",
-+      "name": "355",
-       "members": [
-         {
-           "name": "dir",
-@@ -11501,64 +11536,64 @@
-       "meta-type": "array"
-     },
-     {
--      "name": "355",
-+      "name": "356",
-       "tag": "driver",
-       "variants": [
-         {
-           "case": "file",
--          "type": "603"
-+          "type": "604"
-         },
-         {
-           "case": "gluster",
--          "type": "604"
-+          "type": "605"
-         },
-         {
-           "case": "luks",
--          "type": "605"
-+          "type": "606"
-         },
-         {
-           "case": "nfs",
--          "type": "606"
-+          "type": "607"
-         },
-         {
-           "case": "parallels",
--          "type": "607"
-+          "type": "608"
-         },
-         {
-           "case": "qcow",
--          "type": "608"
-+          "type": "609"
-         },
-         {
-           "case": "qcow2",
--          "type": "609"
-+          "type": "610"
-         },
-         {
-           "case": "qed",
--          "type": "610"
-+          "type": "611"
-         },
-         {
-           "case": "rbd",
--          "type": "611"
-+          "type": "612"
-         },
-         {
-           "case": "ssh",
--          "type": "612"
-+          "type": "613"
-         },
-         {
-           "case": "vdi",
--          "type": "613"
-+          "type": "614"
-         },
-         {
-           "case": "vhdx",
--          "type": "614"
-+          "type": "615"
-         },
-         {
-           "case": "vmdk",
--          "type": "615"
-+          "type": "616"
-         },
-         {
-           "case": "vpc",
--          "type": "616"
-+          "type": "617"
-         },
-         {
-           "case": "blkdebug",
-@@ -11696,22 +11731,22 @@
-       "members": [
-         {
-           "name": "driver",
--          "type": "317"
-+          "type": "318"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "356",
-+      "name": "357",
-       "tag": "driver",
-       "variants": [
-         {
-           "case": "luks",
--          "type": "617"
-+          "type": "618"
-         },
-         {
-           "case": "qcow2",
--          "type": "618"
-+          "type": "619"
-         },
-         {
-           "case": "blkdebug",
-@@ -11897,13 +11932,13 @@
-       "members": [
-         {
-           "name": "driver",
--          "type": "317"
-+          "type": "318"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "357",
-+      "name": "358",
-       "members": [
-         {
-           "name": "read"
-@@ -11919,7 +11954,7 @@
-       ]
-     },
-     {
--      "name": "358",
-+      "name": "359",
-       "members": [
-         {
-           "name": "ignore"
-@@ -11939,7 +11974,7 @@
-       ]
-     },
-     {
--      "name": "359",
-+      "name": "360",
-       "members": [
-         {
-           "type": "str"
-@@ -11951,7 +11986,7 @@
-       "meta-type": "alternate"
-     },
-     {
--      "name": "360",
-+      "name": "361",
-       "members": [
-         {
-           "name": "read"
-@@ -11971,36 +12006,36 @@
-       ]
-     },
-     {
--      "name": "361",
-+      "name": "362",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "inet",
--          "type": "620"
-+          "type": "621"
-         },
-         {
-           "case": "unix",
--          "type": "621"
-+          "type": "622"
-         },
-         {
-           "case": "vsock",
--          "type": "622"
-+          "type": "623"
-         },
-         {
-           "case": "fd",
--          "type": "623"
-+          "type": "624"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "619"
-+          "type": "620"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "362",
-+      "name": "363",
-       "members": [
-         {
-           "name": "safe"
-@@ -12016,7 +12051,7 @@
-       ]
-     },
-     {
--      "name": "363",
-+      "name": "364",
-       "members": [
-         {
-           "name": "nbd"
-@@ -12040,7 +12075,7 @@
-       ]
-     },
-     {
--      "name": "364",
-+      "name": "365",
-       "members": [
-         {
-           "name": "name",
-@@ -12055,7 +12090,7 @@
-         {
-           "name": "bitmaps",
-           "default": null,
--          "type": "[315]"
-+          "type": "[316]"
-         },
-         {
-           "name": "allocation-depth",
-@@ -12066,11 +12101,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "365",
-+      "name": "366",
-       "members": [
-         {
-           "name": "addr",
--          "type": "391"
-+          "type": "392"
-         },
-         {
-           "name": "logical-block-size",
-@@ -12086,7 +12121,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "366",
-+      "name": "367",
-       "members": [
-         {
-           "name": "mountpoint",
-@@ -12100,13 +12135,13 @@
-         {
-           "name": "allow-other",
-           "default": null,
--          "type": "624"
-+          "type": "625"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "367",
-+      "name": "368",
-       "members": [
-         {
-           "name": "name",
-@@ -12136,7 +12171,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "368",
-+      "name": "369",
-       "members": [
-         {
-           "name": "utf8"
-@@ -12152,108 +12187,108 @@
-       ]
-     },
-     {
--      "name": "369",
-+      "name": "370",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "file",
--          "type": "626"
-+          "type": "627"
-         },
-         {
-           "case": "serial",
--          "type": "627"
-+          "type": "628"
-         },
-         {
-           "case": "parallel",
--          "type": "627"
-+          "type": "628"
-         },
-         {
-           "case": "pipe",
--          "type": "627"
-+          "type": "628"
-         },
-         {
-           "case": "socket",
--          "type": "628"
-+          "type": "629"
-         },
-         {
-           "case": "udp",
--          "type": "629"
-+          "type": "630"
-         },
-         {
-           "case": "pty",
--          "type": "630"
-+          "type": "631"
-         },
-         {
-           "case": "null",
--          "type": "631"
-+          "type": "632"
-         },
-         {
-           "case": "mux",
--          "type": "632"
-+          "type": "633"
-         },
-         {
-           "case": "hub",
--          "type": "633"
-+          "type": "634"
-         },
-         {
-           "case": "msmouse",
--          "type": "631"
-+          "type": "632"
-         },
-         {
-           "case": "wctablet",
--          "type": "631"
-+          "type": "632"
-         },
-         {
-           "case": "braille",
--          "type": "631"
-+          "type": "632"
-         },
-         {
-           "case": "testdev",
--          "type": "631"
-+          "type": "632"
-         },
-         {
-           "case": "stdio",
--          "type": "634"
-+          "type": "635"
-         },
-         {
-           "case": "spicevmc",
--          "type": "635"
-+          "type": "636"
-         },
-         {
-           "case": "spiceport",
--          "type": "636"
-+          "type": "637"
-         },
-         {
-           "case": "qemu-vdagent",
--          "type": "637"
-+          "type": "638"
-         },
-         {
-           "case": "dbus",
--          "type": "638"
-+          "type": "639"
-         },
-         {
-           "case": "vc",
--          "type": "639"
-+          "type": "640"
-         },
-         {
-           "case": "ringbuf",
--          "type": "640"
-+          "type": "641"
-         },
-         {
-           "case": "memory",
--          "type": "640"
-+          "type": "641"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "625"
-+          "type": "626"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "370",
-+      "name": "371",
-       "members": [
-         {
-           "name": "elf"
-@@ -12293,7 +12328,7 @@
-       ]
-     },
-     {
--      "name": "371",
-+      "name": "372",
-       "members": [
-         {
-           "name": "none"
-@@ -12317,12 +12352,12 @@
-       ]
-     },
-     {
--      "name": "[370]",
--      "element-type": "370",
-+      "name": "[371]",
-+      "element-type": "371",
-       "meta-type": "array"
-     },
-     {
--      "name": "372",
-+      "name": "373",
-       "members": [
-         {
-           "name": "none"
-@@ -12386,7 +12421,7 @@
-       ]
-     },
-     {
--      "name": "373",
-+      "name": "374",
-       "members": [
-         {
-           "name": "netdev",
-@@ -12417,7 +12452,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "374",
-+      "name": "375",
-       "members": [
-         {
-           "name": "hostname",
-@@ -12477,7 +12512,7 @@
-         {
-           "name": "dnssearch",
-           "default": null,
--          "type": "[641]"
-+          "type": "[642]"
-         },
-         {
-           "name": "domainname",
-@@ -12517,12 +12552,12 @@
-         {
-           "name": "hostfwd",
-           "default": null,
--          "type": "[641]"
-+          "type": "[642]"
-         },
-         {
-           "name": "guestfwd",
-           "default": null,
--          "type": "[641]"
-+          "type": "[642]"
-         },
-         {
-           "name": "tftp-server-name",
-@@ -12533,7 +12568,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "375",
-+      "name": "376",
-       "members": [
-         {
-           "name": "ifname",
-@@ -12614,7 +12649,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "376",
-+      "name": "377",
-       "members": [
-         {
-           "name": "src",
-@@ -12687,7 +12722,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "377",
-+      "name": "378",
-       "members": [
-         {
-           "name": "fd",
-@@ -12723,11 +12758,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "378",
-+      "name": "379",
-       "members": [
-         {
-           "name": "addr",
--          "type": "391"
-+          "type": "392"
-         },
-         {
-           "name": "server",
-@@ -12751,23 +12786,23 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "379",
-+      "name": "380",
-       "members": [
-         {
-           "name": "local",
-           "default": null,
--          "type": "391"
-+          "type": "392"
-         },
-         {
-           "name": "remote",
-           "default": null,
--          "type": "391"
-+          "type": "392"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "380",
-+      "name": "381",
-       "members": [
-         {
-           "name": "sock",
-@@ -12793,7 +12828,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "381",
-+      "name": "382",
-       "members": [
-         {
-           "name": "br",
-@@ -12809,7 +12844,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "382",
-+      "name": "383",
-       "members": [
-         {
-           "name": "hubid",
-@@ -12824,7 +12859,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "383",
-+      "name": "384",
-       "members": [
-         {
-           "name": "ifname",
-@@ -12839,7 +12874,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "385",
-+      "name": "386",
-       "members": [
-         {
-           "name": "chardev",
-@@ -12859,7 +12894,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "386",
-+      "name": "387",
-       "members": [
-         {
-           "name": "vhostdev",
-@@ -12888,7 +12923,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "390",
-+      "name": "391",
-       "members": [
-         {
-           "name": "normal"
-@@ -12913,36 +12948,36 @@
-       "meta-type": "array"
-     },
-     {
--      "name": "391",
-+      "name": "392",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "inet",
--          "type": "601"
-+          "type": "602"
-         },
-         {
-           "case": "unix",
--          "type": "643"
-+          "type": "644"
-         },
-         {
-           "case": "vsock",
--          "type": "644"
-+          "type": "645"
-         },
-         {
-           "case": "fd",
--          "type": "645"
-+          "type": "646"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "619"
-+          "type": "620"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "392",
-+      "name": "393",
-       "members": [
-         {
-           "name": "rss"
-@@ -12954,7 +12989,7 @@
-       ]
-     },
-     {
--      "name": "393",
-+      "name": "394",
-       "members": [
-         {
-           "name": "half"
-@@ -12970,7 +13005,7 @@
-       ]
-     },
-     {
--      "name": "394",
-+      "name": "395",
-       "members": [
-         {
-           "name": "off"
-@@ -12986,7 +13021,7 @@
-       ]
-     },
-     {
--      "name": "395",
-+      "name": "396",
-       "members": [
-         {
-           "name": "priority",
-@@ -13045,7 +13080,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "396",
-+      "name": "397",
-       "members": [
-         {
-           "name": "in-pport",
-@@ -13086,7 +13121,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "397",
-+      "name": "398",
-       "members": [
-         {
-           "name": "goto-tbl",
-@@ -13122,28 +13157,28 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "398",
-+      "name": "399",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "passthrough",
--          "type": "646"
-+          "type": "647"
-         },
-         {
-           "case": "emulator",
--          "type": "647"
-+          "type": "648"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "121"
-+          "type": "122"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "399",
-+      "name": "400",
-       "members": [
-         {
-           "name": "vnc"
-@@ -13159,7 +13194,7 @@
-       ]
-     },
-     {
--      "name": "400",
-+      "name": "401",
-       "members": [
-         {
-           "name": "keep"
-@@ -13179,7 +13214,7 @@
-       ]
-     },
-     {
--      "name": "401",
-+      "name": "402",
-       "members": [
-         {
-           "name": "display",
-@@ -13190,7 +13225,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "402",
-+      "name": "403",
-       "members": [
-         {
-           "name": "display",
-@@ -13201,7 +13236,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "403",
-+      "name": "404",
-       "members": [
-         {
-           "name": "ppm"
-@@ -13217,7 +13252,7 @@
-       ]
-     },
-     {
--      "name": "404",
-+      "name": "405",
-       "members": [
-         {
-           "name": "client"
-@@ -13237,12 +13272,12 @@
-       ]
-     },
-     {
--      "name": "[405]",
--      "element-type": "405",
-+      "name": "[406]",
-+      "element-type": "406",
-       "meta-type": "array"
-     },
-     {
--      "name": "405",
-+      "name": "406",
-       "members": [
-         {
-           "name": "host",
-@@ -13254,7 +13289,7 @@
-         },
-         {
-           "name": "family",
--          "type": "408"
-+          "type": "409"
-         },
-         {
-           "name": "connection-id",
-@@ -13276,7 +13311,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "406",
-+      "name": "407",
-       "members": [
-         {
-           "name": "host",
-@@ -13288,13 +13323,13 @@
-         },
-         {
-           "name": "family",
--          "type": "408"
-+          "type": "409"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "407",
-+      "name": "408",
-       "members": [
-         {
-           "name": "host",
-@@ -13306,7 +13341,7 @@
-         },
-         {
-           "name": "family",
--          "type": "408"
-+          "type": "409"
-         },
-         {
-           "name": "auth",
-@@ -13317,7 +13352,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "408",
-+      "name": "409",
-       "members": [
-         {
-           "name": "ipv4"
-@@ -13345,12 +13380,12 @@
-       ]
-     },
-     {
--      "name": "[409]",
--      "element-type": "409",
-+      "name": "[410]",
-+      "element-type": "410",
-       "meta-type": "array"
-     },
-     {
--      "name": "409",
-+      "name": "410",
-       "members": [
-         {
-           "name": "host",
-@@ -13362,7 +13397,7 @@
-         },
-         {
-           "name": "family",
--          "type": "408"
-+          "type": "409"
-         },
-         {
-           "name": "websocket",
-@@ -13382,12 +13417,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[410]",
--      "element-type": "410",
-+      "name": "[411]",
-+      "element-type": "411",
-       "meta-type": "array"
-     },
-     {
--      "name": "410",
-+      "name": "411",
-       "members": [
-         {
-           "name": "host",
-@@ -13399,7 +13434,7 @@
-         },
-         {
-           "name": "family",
--          "type": "408"
-+          "type": "409"
-         },
-         {
-           "name": "websocket",
-@@ -13407,18 +13442,18 @@
-         },
-         {
-           "name": "auth",
--          "type": "411"
-+          "type": "412"
-         },
-         {
-           "name": "vencrypt",
-           "default": null,
--          "type": "412"
-+          "type": "413"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "411",
-+      "name": "412",
-       "members": [
-         {
-           "name": "none"
-@@ -13462,7 +13497,7 @@
-       ]
-     },
-     {
--      "name": "412",
-+      "name": "413",
-       "members": [
-         {
-           "name": "plain"
-@@ -13506,7 +13541,7 @@
-       ]
-     },
-     {
--      "name": "413",
-+      "name": "414",
-       "members": [
-         {
-           "name": "host",
-@@ -13518,7 +13553,7 @@
-         },
-         {
-           "name": "family",
--          "type": "408"
-+          "type": "409"
-         },
-         {
-           "name": "websocket",
-@@ -13533,7 +13568,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "414",
-+      "name": "415",
-       "members": [
-         {
-           "name": "host",
-@@ -13545,7 +13580,7 @@
-         },
-         {
-           "name": "family",
--          "type": "408"
-+          "type": "409"
-         },
-         {
-           "name": "websocket",
-@@ -13555,71 +13590,71 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[415]",
--      "element-type": "415",
-+      "name": "[416]",
-+      "element-type": "416",
-       "meta-type": "array"
-     },
-     {
--      "name": "415",
-+      "name": "416",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "number",
--          "type": "649"
-+          "type": "650"
-         },
-         {
-           "case": "qcode",
--          "type": "650"
-+          "type": "651"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "648"
-+          "type": "649"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[416]",
--      "element-type": "416",
-+      "name": "[417]",
-+      "element-type": "417",
-       "meta-type": "array"
-     },
-     {
--      "name": "416",
-+      "name": "417",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "key",
--          "type": "652"
-+          "type": "653"
-         },
-         {
-           "case": "btn",
--          "type": "653"
-+          "type": "654"
-         },
-         {
-           "case": "rel",
--          "type": "654"
-+          "type": "655"
-         },
-         {
-           "case": "abs",
--          "type": "654"
-+          "type": "655"
-         },
-         {
-           "case": "mtt",
--          "type": "655"
-+          "type": "656"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "651"
-+          "type": "652"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "417",
-+      "name": "418",
-       "members": [
-         {
-           "name": "default"
-@@ -13655,7 +13690,7 @@
-       ]
-     },
-     {
--      "name": "418",
-+      "name": "419",
-       "members": [
-         {
-           "name": "off"
-@@ -13679,7 +13714,7 @@
-       ]
-     },
-     {
--      "name": "419",
-+      "name": "420",
-       "members": [
-         {
-           "name": "grab-on-hover",
-@@ -13705,7 +13740,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "420",
-+      "name": "421",
-       "members": [
-         {
-           "name": "left-command-key",
-@@ -13736,7 +13771,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "421",
-+      "name": "422",
-       "members": [
-         {
-           "name": "charset",
-@@ -13747,7 +13782,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "422",
-+      "name": "423",
-       "members": [
-         {
-           "name": "rendernode",
-@@ -13758,7 +13793,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "423",
-+      "name": "424",
-       "members": [
-         {
-           "name": "rendernode",
-@@ -13784,18 +13819,18 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "424",
-+      "name": "425",
-       "members": [
-         {
-           "name": "grab-mod",
-           "default": null,
--          "type": "656"
-+          "type": "657"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "425",
-+      "name": "426",
-       "members": [
-         {
-           "name": "vnc"
-@@ -13807,7 +13842,7 @@
-       ]
-     },
-     {
--      "name": "426",
-+      "name": "427",
-       "members": [
-         {
-           "name": "tls-certs",
-@@ -13818,7 +13853,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "427",
-+      "name": "428",
-       "members": [
-         {
-           "name": "vnc"
-@@ -13830,18 +13865,18 @@
-       ]
-     },
-     {
--      "name": "428",
-+      "name": "429",
-       "members": [
-         {
-           "name": "addresses",
-           "default": null,
--          "type": "[391]"
-+          "type": "[392]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "429",
-+      "name": "430",
-       "members": [
-         {
-           "name": "none"
-@@ -13909,7 +13944,7 @@
-       ]
-     },
-     {
--      "name": "430",
-+      "name": "431",
-       "members": [
-         {
-           "name": "transferred",
-@@ -13983,7 +14018,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "431",
-+      "name": "432",
-       "members": [
-         {
-           "name": "transferred",
-@@ -13993,7 +14028,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "432",
-+      "name": "433",
-       "members": [
-         {
-           "name": "cache-size",
-@@ -14027,12 +14062,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[391]",
--      "element-type": "391",
-+      "name": "[392]",
-+      "element-type": "392",
-       "meta-type": "array"
-     },
-     {
--      "name": "433",
-+      "name": "434",
-       "members": [
-         {
-           "name": "xbzrle"
-@@ -14137,7 +14172,7 @@
-       ]
-     },
-     {
--      "name": "434",
-+      "name": "435",
-       "members": [
-         {
-           "name": "none"
-@@ -14157,12 +14192,12 @@
-       ]
-     },
-     {
--      "name": "[435]",
--      "element-type": "435",
-+      "name": "[436]",
-+      "element-type": "436",
-       "meta-type": "array"
-     },
-     {
--      "name": "435",
-+      "name": "436",
-       "members": [
-         {
-           "name": "node-name",
-@@ -14174,13 +14209,13 @@
-         },
-         {
-           "name": "bitmaps",
--          "type": "[657]"
-+          "type": "[658]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "436",
-+      "name": "437",
-       "members": [
-         {
-           "name": "normal"
-@@ -14200,7 +14235,7 @@
-       ]
-     },
-     {
--      "name": "437",
-+      "name": "438",
-       "members": [
-         {
-           "name": "none"
-@@ -14220,7 +14255,7 @@
-       ]
-     },
-     {
--      "name": "438",
-+      "name": "439",
-       "members": [
-         {
-           "name": "none"
-@@ -14240,7 +14275,7 @@
-       ]
-     },
-     {
--      "name": "439",
-+      "name": "440",
-       "members": [
-         {
-           "name": "none"
-@@ -14264,26 +14299,26 @@
-       ]
-     },
-     {
--      "name": "[440]",
--      "element-type": "440",
-+      "name": "[441]",
-+      "element-type": "441",
-       "meta-type": "array"
-     },
-     {
--      "name": "440",
-+      "name": "441",
-       "members": [
-         {
-           "name": "channel-type",
--          "type": "658"
-+          "type": "659"
-         },
-         {
-           "name": "addr",
--          "type": "659"
-+          "type": "660"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "441",
-+      "name": "442",
-       "members": [
-         {
-           "name": "second"
-@@ -14299,7 +14334,7 @@
-       ]
-     },
-     {
--      "name": "442",
-+      "name": "443",
-       "members": [
-         {
-           "name": "page-sampling"
-@@ -14319,7 +14354,7 @@
-       ]
-     },
-     {
--      "name": "443",
-+      "name": "444",
-       "members": [
-         {
-           "name": "unstarted"
-@@ -14339,12 +14374,12 @@
-       ]
-     },
-     {
--      "name": "[444]",
--      "element-type": "444",
-+      "name": "[445]",
-+      "element-type": "445",
-       "meta-type": "array"
-     },
-     {
--      "name": "444",
-+      "name": "445",
-       "members": [
-         {
-           "name": "id",
-@@ -14358,84 +14393,84 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[445]",
--      "element-type": "445",
-+      "name": "[446]",
-+      "element-type": "446",
-       "meta-type": "array"
-     },
-     {
--      "name": "445",
-+      "name": "446",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "abort",
--          "type": "661"
-+          "type": "662"
-         },
-         {
-           "case": "block-dirty-bitmap-add",
--          "type": "662"
-+          "type": "663"
-         },
-         {
-           "case": "block-dirty-bitmap-remove",
--          "type": "663"
-+          "type": "664"
-         },
-         {
-           "case": "block-dirty-bitmap-clear",
--          "type": "663"
-+          "type": "664"
-         },
-         {
-           "case": "block-dirty-bitmap-enable",
--          "type": "663"
-+          "type": "664"
-         },
-         {
-           "case": "block-dirty-bitmap-disable",
--          "type": "663"
-+          "type": "664"
-         },
-         {
-           "case": "block-dirty-bitmap-merge",
--          "type": "664"
-+          "type": "665"
-         },
-         {
-           "case": "blockdev-backup",
--          "type": "665"
-+          "type": "666"
-         },
-         {
-           "case": "blockdev-snapshot",
--          "type": "666"
-+          "type": "667"
-         },
-         {
-           "case": "blockdev-snapshot-internal-sync",
--          "type": "667"
-+          "type": "668"
-         },
-         {
-           "case": "blockdev-snapshot-sync",
--          "type": "668"
-+          "type": "669"
-         },
-         {
-           "case": "drive-backup",
--          "type": "669"
-+          "type": "670"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "660"
-+          "type": "661"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "446",
-+      "name": "447",
-       "members": [
-         {
-           "name": "completion-mode",
-           "default": null,
--          "type": "670"
-+          "type": "671"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "447",
-+      "name": "448",
-       "members": [
-         {
-           "name": "unavailable"
-@@ -14455,12 +14490,12 @@
-       ]
-     },
-     {
--      "name": "[448]",
--      "element-type": "448",
-+      "name": "[449]",
-+      "element-type": "449",
-       "meta-type": "array"
-     },
-     {
--      "name": "448",
-+      "name": "449",
-       "members": [
-         {
-           "name": "oob"
-@@ -14472,7 +14507,7 @@
-       ]
-     },
-     {
--      "name": "449",
-+      "name": "450",
-       "members": [
-         {
-           "name": "major",
-@@ -14490,7 +14525,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "450",
-+      "name": "451",
-       "members": [
-         {
-           "name": "builtin"
-@@ -14526,21 +14561,21 @@
-       ]
-     },
-     {
--      "name": "451",
-+      "name": "452",
-       "members": [
-         {
-           "name": "json-type",
--          "type": "671"
-+          "type": "672"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "452",
-+      "name": "453",
-       "members": [
-         {
-           "name": "members",
--          "type": "[672]"
-+          "type": "[673]"
-         },
-         {
-           "name": "values",
-@@ -14553,7 +14588,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "453",
-+      "name": "454",
-       "members": [
-         {
-           "name": "element-type",
-@@ -14563,11 +14598,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "454",
-+      "name": "455",
-       "members": [
-         {
-           "name": "members",
--          "type": "[673]"
-+          "type": "[674]"
-         },
-         {
-           "name": "tag",
-@@ -14577,23 +14612,23 @@
-         {
-           "name": "variants",
-           "default": null,
--          "type": "[674]"
-+          "type": "[675]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "455",
-+      "name": "456",
-       "members": [
-         {
-           "name": "members",
--          "type": "[675]"
-+          "type": "[676]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "456",
-+      "name": "457",
-       "members": [
-         {
-           "name": "arg-type",
-@@ -14612,7 +14647,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "457",
-+      "name": "458",
-       "members": [
-         {
-           "name": "arg-type",
-@@ -14622,7 +14657,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "458",
-+      "name": "459",
-       "members": [
-         {
-           "name": "acpi-generic-initiator"
-@@ -14832,7 +14867,7 @@
-       ]
-     },
-     {
--      "name": "459",
-+      "name": "460",
-       "members": [
-         {
-           "name": "pci-dev",
-@@ -14846,7 +14881,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "460",
-+      "name": "461",
-       "members": [
-         {
-           "name": "pci-bus",
-@@ -14860,23 +14895,23 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "461",
-+      "name": "462",
-       "members": [
-         {
-           "name": "policy",
-           "default": null,
--          "type": "676"
-+          "type": "677"
-         },
-         {
-           "name": "rules",
-           "default": null,
--          "type": "[677]"
-+          "type": "[678]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "462",
-+      "name": "463",
-       "members": [
-         {
-           "name": "filename",
-@@ -14891,7 +14926,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "463",
-+      "name": "464",
-       "members": [
-         {
-           "name": "service",
-@@ -14901,7 +14936,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "464",
-+      "name": "465",
-       "members": [
-         {
-           "name": "identity",
-@@ -14911,7 +14946,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "465",
-+      "name": "466",
-       "members": [
-         {
-           "name": "if",
-@@ -14925,7 +14960,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "466",
-+      "name": "467",
-       "members": [
-         {
-           "name": "primary_in",
-@@ -14972,7 +15007,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "467",
-+      "name": "468",
-       "members": [
-         {
-           "name": "queues",
-@@ -14993,7 +15028,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "468",
-+      "name": "469",
-       "members": [
-         {
-           "name": "queues",
-@@ -15018,7 +15053,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "469",
-+      "name": "470",
-       "members": [
-         {
-           "name": "addr",
-@@ -15033,7 +15068,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "470",
-+      "name": "471",
-       "members": [
-         {
-           "name": "netdev",
-@@ -15042,7 +15077,7 @@
-         {
-           "name": "queue",
-           "default": null,
--          "type": "678"
-+          "type": "679"
-         },
-         {
-           "name": "status",
-@@ -15057,7 +15092,7 @@
-         {
-           "name": "insert",
-           "default": null,
--          "type": "679"
-+          "type": "680"
-         },
-         {
-           "name": "interval",
-@@ -15067,7 +15102,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "471",
-+      "name": "472",
-       "members": [
-         {
-           "name": "netdev",
-@@ -15076,7 +15111,7 @@
-         {
-           "name": "queue",
-           "default": null,
--          "type": "678"
-+          "type": "679"
-         },
-         {
-           "name": "status",
-@@ -15091,7 +15126,7 @@
-         {
-           "name": "insert",
-           "default": null,
--          "type": "679"
-+          "type": "680"
-         },
-         {
-           "name": "file",
-@@ -15106,7 +15141,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "472",
-+      "name": "473",
-       "members": [
-         {
-           "name": "netdev",
-@@ -15115,7 +15150,7 @@
-         {
-           "name": "queue",
-           "default": null,
--          "type": "678"
-+          "type": "679"
-         },
-         {
-           "name": "status",
-@@ -15130,7 +15165,7 @@
-         {
-           "name": "insert",
-           "default": null,
--          "type": "679"
-+          "type": "680"
-         },
-         {
-           "name": "outdev",
-@@ -15145,7 +15180,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "473",
-+      "name": "474",
-       "members": [
-         {
-           "name": "netdev",
-@@ -15154,7 +15189,7 @@
-         {
-           "name": "queue",
-           "default": null,
--          "type": "678"
-+          "type": "679"
-         },
-         {
-           "name": "status",
-@@ -15169,7 +15204,7 @@
-         {
-           "name": "insert",
-           "default": null,
--          "type": "679"
-+          "type": "680"
-         },
-         {
-           "name": "indev",
-@@ -15190,7 +15225,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "474",
-+      "name": "475",
-       "members": [
-         {
-           "name": "netdev",
-@@ -15199,7 +15234,7 @@
-         {
-           "name": "queue",
-           "default": null,
--          "type": "678"
-+          "type": "679"
-         },
-         {
-           "name": "status",
-@@ -15214,13 +15249,13 @@
-         {
-           "name": "insert",
-           "default": null,
--          "type": "679"
-+          "type": "680"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "475",
-+      "name": "476",
-       "members": [
-         {
-           "name": "netdev",
-@@ -15229,7 +15264,7 @@
-         {
-           "name": "queue",
-           "default": null,
--          "type": "678"
-+          "type": "679"
-         },
-         {
-           "name": "status",
-@@ -15244,7 +15279,7 @@
-         {
-           "name": "insert",
-           "default": null,
--          "type": "679"
-+          "type": "680"
-         },
-         {
-           "name": "vnet_hdr_support",
-@@ -15255,7 +15290,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "476",
-+      "name": "477",
-       "members": [
-         {
-           "name": "name",
-@@ -15295,7 +15330,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "477",
-+      "name": "478",
-       "members": [
-         {
-           "name": "evdev",
-@@ -15314,13 +15349,13 @@
-         {
-           "name": "grab-toggle",
-           "default": null,
--          "type": "680"
-+          "type": "681"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "478",
-+      "name": "479",
-       "members": [
-         {
-           "name": "fd",
-@@ -15331,7 +15366,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "479",
-+      "name": "480",
-       "members": [
-         {
-           "name": "aio-max-batch",
-@@ -15367,7 +15402,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "480",
-+      "name": "481",
-       "members": [
-         {
-           "name": "aio-max-batch",
-@@ -15388,7 +15423,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "481",
-+      "name": "482",
-       "members": [
-         {
-           "name": "dump",
-@@ -15408,7 +15443,7 @@
-         {
-           "name": "policy",
-           "default": null,
--          "type": "507"
-+          "type": "508"
-         },
-         {
-           "name": "prealloc",
-@@ -15448,7 +15483,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "482",
-+      "name": "483",
-       "members": [
-         {
-           "name": "dump",
-@@ -15468,7 +15503,7 @@
-         {
-           "name": "policy",
-           "default": null,
--          "type": "507"
-+          "type": "508"
-         },
-         {
-           "name": "prealloc",
-@@ -15536,13 +15571,13 @@
-         {
-           "name": "rom",
-           "default": null,
--          "type": "587"
-+          "type": "588"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "483",
-+      "name": "484",
-       "members": [
-         {
-           "name": "dump",
-@@ -15562,7 +15597,7 @@
-         {
-           "name": "policy",
-           "default": null,
--          "type": "507"
-+          "type": "508"
-         },
-         {
-           "name": "prealloc",
-@@ -15616,66 +15651,6 @@
-       ],
-       "meta-type": "object"
-     },
--    {
--      "name": "484",
--      "members": [
--        {
--          "name": "dump",
--          "default": null,
--          "type": "bool"
--        },
--        {
--          "name": "host-nodes",
--          "default": null,
--          "type": "[int]"
--        },
--        {
--          "name": "merge",
--          "default": null,
--          "type": "bool"
--        },
--        {
--          "name": "policy",
--          "default": null,
--          "type": "507"
--        },
--        {
--          "name": "prealloc",
--          "default": null,
--          "type": "bool"
--        },
--        {
--          "name": "prealloc-threads",
--          "default": null,
--          "type": "int"
--        },
--        {
--          "name": "prealloc-context",
--          "default": null,
--          "type": "str"
--        },
--        {
--          "name": "share",
--          "default": null,
--          "type": "bool"
--        },
--        {
--          "name": "reserve",
--          "default": null,
--          "type": "bool"
--        },
--        {
--          "name": "size",
--          "type": "int"
--        },
--        {
--          "name": "x-use-canonical-path-for-ramblock-id",
--          "default": null,
--          "type": "bool"
--        }
--      ],
--      "meta-type": "object"
--    },
-     {
-       "name": "485",
-       "members": [
-@@ -15697,7 +15672,7 @@
-         {
-           "name": "policy",
-           "default": null,
--          "type": "507"
-+          "type": "508"
-         },
-         {
-           "name": "prealloc",
-@@ -15740,14 +15715,74 @@
-       "name": "486",
-       "members": [
-         {
--          "name": "path",
-+          "name": "dump",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "merge",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "508"
-+        },
-+        {
-+          "name": "prealloc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-context",
-+          "default": null,
-           "type": "str"
-+        },
-+        {
-+          "name": "share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-use-canonical-path-for-ramblock-id",
-+          "default": null,
-+          "type": "bool"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
-       "name": "487",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "488",
-       "members": [
-         {
-           "name": "chardev",
-@@ -15762,7 +15797,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "488",
-+      "name": "489",
-       "members": [
-         {
-           "name": "opened",
-@@ -15776,7 +15811,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "489",
-+      "name": "490",
-       "members": [
-         {
-           "name": "opened",
-@@ -15794,7 +15829,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "490",
-+      "name": "491",
-       "members": [
-         {
-           "name": "opened",
-@@ -15813,12 +15848,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "491",
-+      "name": "492",
-       "members": [
-         {
-           "name": "format",
-           "default": null,
--          "type": "681"
-+          "type": "682"
-         },
-         {
-           "name": "keyid",
-@@ -15844,12 +15879,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "492",
-+      "name": "493",
-       "members": [
-         {
-           "name": "format",
-           "default": null,
--          "type": "681"
-+          "type": "682"
-         },
-         {
-           "name": "keyid",
-@@ -15869,7 +15904,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "493",
-+      "name": "494",
-       "members": [
-         {
-           "name": "sev-device",
-@@ -15913,13 +15948,13 @@
-         {
-           "name": "legacy-vm-type",
-           "default": null,
--          "type": "587"
-+          "type": "588"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "494",
-+      "name": "495",
-       "members": [
-         {
-           "name": "sev-device",
-@@ -15979,7 +16014,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "495",
-+      "name": "496",
-       "members": [
-         {
-           "name": "cpu-affinity",
-@@ -15995,12 +16030,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "496",
-+      "name": "497",
-       "members": [
-         {
-           "name": "limits",
-           "default": null,
--          "type": "682"
-+          "type": "683"
-         },
-         {
-           "name": "x-iops-total",
-@@ -16158,7 +16193,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "497",
-+      "name": "498",
-       "members": [
-         {
-           "name": "verify-peer",
-@@ -16173,7 +16208,7 @@
-         {
-           "name": "endpoint",
-           "default": null,
--          "type": "683"
-+          "type": "684"
-         },
-         {
-           "name": "priority",
-@@ -16184,7 +16219,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "498",
-+      "name": "499",
-       "members": [
-         {
-           "name": "verify-peer",
-@@ -16199,7 +16234,7 @@
-         {
-           "name": "endpoint",
-           "default": null,
--          "type": "683"
-+          "type": "684"
-         },
-         {
-           "name": "priority",
-@@ -16215,7 +16250,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "499",
-+      "name": "500",
-       "members": [
-         {
-           "name": "verify-peer",
-@@ -16230,7 +16265,7 @@
-         {
-           "name": "endpoint",
-           "default": null,
--          "type": "683"
-+          "type": "684"
-         },
-         {
-           "name": "priority",
-@@ -16251,7 +16286,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "500",
-+      "name": "501",
-       "members": [
-         {
-           "name": "verify-peer",
-@@ -16266,7 +16301,7 @@
-         {
-           "name": "endpoint",
-           "default": null,
--          "type": "683"
-+          "type": "684"
-         },
-         {
-           "name": "priority",
-@@ -16277,7 +16312,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "501",
-+      "name": "502",
-       "members": [
-         {
-           "name": "fd",
-@@ -16291,11 +16326,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "502",
-+      "name": "503",
-       "members": [
-         {
-           "name": "socket",
--          "type": "391"
-+          "type": "392"
-         },
-         {
-           "name": "device",
-@@ -16305,7 +16340,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "503",
-+      "name": "504",
-       "members": [
-         {
-           "name": "node-id",
-@@ -16356,7 +16391,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "504",
-+      "name": "505",
-       "members": [
-         {
-           "name": "aarch64"
-@@ -16480,11 +16515,11 @@
-       ]
-     },
-     {
--      "name": "505",
-+      "name": "506",
-       "members": [
-         {
-           "name": "cpu-state",
--          "type": "684"
-+          "type": "685"
-         },
-         {
-           "name": "dedicated",
-@@ -16494,18 +16529,18 @@
-         {
-           "name": "entitlement",
-           "default": null,
--          "type": "523"
-+          "type": "524"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[506]",
--      "element-type": "506",
-+      "name": "[507]",
-+      "element-type": "507",
-       "meta-type": "array"
-     },
-     {
--      "name": "506",
-+      "name": "507",
-       "members": [
-         {
-           "name": "qom-type",
-@@ -16523,7 +16558,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "507",
-+      "name": "508",
-       "members": [
-         {
-           "name": "default"
-@@ -16547,7 +16582,7 @@
-       ]
-     },
-     {
--      "name": "508",
-+      "name": "509",
-       "members": [
-         {
-           "name": "node"
-@@ -16575,7 +16610,7 @@
-       ]
-     },
-     {
--      "name": "509",
-+      "name": "510",
-       "members": [
-         {
-           "name": "nodeid",
-@@ -16606,7 +16641,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "510",
-+      "name": "511",
-       "members": [
-         {
-           "name": "src",
-@@ -16624,7 +16659,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "511",
-+      "name": "512",
-       "members": [
-         {
-           "name": "node-id",
-@@ -16675,7 +16710,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "512",
-+      "name": "513",
-       "members": [
-         {
-           "name": "initiator",
-@@ -16687,11 +16722,11 @@
-         },
-         {
-           "name": "hierarchy",
--          "type": "685"
-+          "type": "686"
-         },
-         {
-           "name": "data-type",
--          "type": "686"
-+          "type": "687"
-         },
-         {
-           "name": "latency",
-@@ -16707,7 +16742,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "513",
-+      "name": "514",
-       "members": [
-         {
-           "name": "node-id",
-@@ -16723,11 +16758,11 @@
-         },
-         {
-           "name": "associativity",
--          "type": "687"
-+          "type": "688"
-         },
-         {
-           "name": "policy",
--          "type": "688"
-+          "type": "689"
-         },
-         {
-           "name": "line",
-@@ -16737,7 +16772,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "514",
-+      "name": "515",
-       "members": [
-         {
-           "name": "dimm"
-@@ -16768,16 +16803,6 @@
-         "hv-balloon"
-       ]
-     },
--    {
--      "name": "515",
--      "members": [
--        {
--          "name": "data",
--          "type": "689"
--        }
--      ],
--      "meta-type": "object"
--    },
-     {
-       "name": "516",
-       "members": [
-@@ -16820,6 +16845,16 @@
-     },
-     {
-       "name": "520",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "694"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "521",
-       "members": [
-         {
-           "name": "name",
-@@ -16834,7 +16869,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "521",
-+      "name": "522",
-       "members": [
-         {
-           "name": "incompatible"
-@@ -16858,7 +16893,7 @@
-       ]
-     },
-     {
--      "name": "522",
-+      "name": "523",
-       "members": [
-         {
-           "name": "static"
-@@ -16874,7 +16909,7 @@
-       ]
-     },
-     {
--      "name": "523",
-+      "name": "524",
-       "members": [
-         {
-           "name": "auto"
-@@ -16898,7 +16933,7 @@
-       ]
-     },
-     {
--      "name": "525",
-+      "name": "526",
-       "members": [
-         {
-           "name": "none"
-@@ -16918,7 +16953,7 @@
-       ]
-     },
-     {
--      "name": "526",
-+      "name": "527",
-       "members": [
-         {
-           "name": "block-node"
-@@ -16938,7 +16973,7 @@
-       ]
-     },
-     {
--      "name": "527",
-+      "name": "528",
-       "members": [
-         {
-           "name": "node-name",
-@@ -16948,7 +16983,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "528",
-+      "name": "529",
-       "members": [
-         {
-           "name": "id",
-@@ -16958,12 +16993,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[529]",
--      "element-type": "529",
-+      "name": "[530]",
-+      "element-type": "530",
-       "meta-type": "array"
-     },
-     {
--      "name": "529",
-+      "name": "530",
-       "members": [
-         {
-           "name": "fd",
-@@ -16978,12 +17013,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[530]",
--      "element-type": "530",
-+      "name": "[531]",
-+      "element-type": "531",
-       "meta-type": "array"
-     },
-     {
--      "name": "530",
-+      "name": "531",
-       "members": [
-         {
-           "name": "name",
-@@ -16991,7 +17026,7 @@
-         },
-         {
-           "name": "type",
--          "type": "694"
-+          "type": "695"
-         },
-         {
-           "name": "help",
-@@ -17007,7 +17042,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "531",
-+      "name": "532",
-       "members": [
-         {
-           "name": "uninit"
-@@ -17039,7 +17074,7 @@
-       ]
-     },
-     {
--      "name": "532",
-+      "name": "533",
-       "members": [
-         {
-           "name": "sev"
-@@ -17055,7 +17090,7 @@
-       ]
-     },
-     {
--      "name": "533",
-+      "name": "534",
-       "members": [
-         {
-           "name": "policy",
-@@ -17069,7 +17104,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "534",
-+      "name": "535",
-       "members": [
-         {
-           "name": "snp-policy",
-@@ -17079,12 +17114,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[535]",
--      "element-type": "535",
-+      "name": "[536]",
-+      "element-type": "536",
-       "meta-type": "array"
-     },
-     {
--      "name": "535",
-+      "name": "536",
-       "members": [
-         {
-           "name": "node",
-@@ -17098,7 +17133,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "536",
-+      "name": "537",
-       "members": [
-         {
-           "name": "closed"
-@@ -17130,7 +17165,7 @@
-       ]
-     },
-     {
--      "name": "537",
-+      "name": "538",
-       "members": [
-         {
-           "name": "none"
-@@ -17170,33 +17205,33 @@
-       ]
-     },
-     {
--      "name": "538",
-+      "name": "539",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "695"
-+          "type": "696"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "695"
-+          "type": "696"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "539",
-+      "name": "540",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "696"
-+          "type": "697"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "696"
-+          "type": "697"
-         },
-         {
-           "name": "threshold",
-@@ -17207,33 +17242,33 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "540",
-+      "name": "541",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "697"
-+          "type": "698"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "697"
-+          "type": "698"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "541",
-+      "name": "542",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "695"
-+          "type": "696"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "695"
-+          "type": "696"
-         },
-         {
-           "name": "nsamples",
-@@ -17244,17 +17279,17 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "542",
-+      "name": "543",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "695"
-+          "type": "696"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "695"
-+          "type": "696"
-         },
-         {
-           "name": "latency",
-@@ -17265,33 +17300,33 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "543",
-+      "name": "544",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "698"
-+          "type": "699"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "698"
-+          "type": "699"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "544",
-+      "name": "545",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "699"
-+          "type": "700"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "699"
-+          "type": "700"
-         },
-         {
-           "name": "try-mmap",
-@@ -17312,17 +17347,17 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "545",
-+      "name": "546",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "700"
-+          "type": "701"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "700"
-+          "type": "701"
-         },
-         {
-           "name": "server",
-@@ -17333,49 +17368,49 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "546",
-+      "name": "547",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "701"
-+          "type": "702"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "701"
-+          "type": "702"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "547",
-+      "name": "548",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "702"
-+          "type": "703"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "702"
-+          "type": "703"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "548",
-+      "name": "549",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "695"
-+          "type": "696"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "695"
-+          "type": "696"
-         },
-         {
-           "name": "dev",
-@@ -17391,17 +17426,17 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "549",
-+      "name": "550",
-       "members": [
-         {
-           "name": "in",
-           "default": null,
--          "type": "695"
-+          "type": "696"
-         },
-         {
-           "name": "out",
-           "default": null,
--          "type": "695"
-+          "type": "696"
-         },
-         {
-           "name": "path",
-@@ -17412,7 +17447,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "550",
-+      "name": "551",
-       "members": [
-         {
-           "name": "DIMM"
-@@ -17428,12 +17463,12 @@
-       ]
-     },
-     {
--      "name": "[551]",
--      "element-type": "551",
-+      "name": "[552]",
-+      "element-type": "552",
-       "meta-type": "array"
-     },
-     {
--      "name": "551",
-+      "name": "552",
-       "members": [
-         {
-           "name": "bus",
-@@ -17449,11 +17484,11 @@
-         },
-         {
-           "name": "class_info",
--          "type": "703"
-+          "type": "704"
-         },
-         {
-           "name": "id",
--          "type": "704"
-+          "type": "705"
-         },
-         {
-           "name": "irq",
-@@ -17471,17 +17506,17 @@
-         {
-           "name": "pci_bridge",
-           "default": null,
--          "type": "705"
-+          "type": "706"
-         },
-         {
-           "name": "regions",
--          "type": "[706]"
-+          "type": "[707]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "552",
-+      "name": "553",
-       "members": [
-         {
-           "name": "vm"
-@@ -17501,16 +17536,16 @@
-       ]
-     },
-     {
--      "name": "[553]",
--      "element-type": "553",
-+      "name": "[554]",
-+      "element-type": "554",
-       "meta-type": "array"
-     },
-     {
--      "name": "553",
-+      "name": "554",
-       "members": [
-         {
-           "name": "provider",
--          "type": "555"
-+          "type": "556"
-         },
-         {
-           "name": "names",
-@@ -17521,7 +17556,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "554",
-+      "name": "555",
-       "members": [
-         {
-           "name": "vcpus",
-@@ -17532,7 +17567,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "555",
-+      "name": "556",
-       "members": [
-         {
-           "name": "kvm"
-@@ -17548,12 +17583,12 @@
-       ]
-     },
-     {
--      "name": "[556]",
--      "element-type": "556",
-+      "name": "[557]",
-+      "element-type": "557",
-       "meta-type": "array"
-     },
-     {
--      "name": "556",
-+      "name": "557",
-       "members": [
-         {
-           "name": "name",
-@@ -17561,18 +17596,18 @@
-         },
-         {
-           "name": "value",
--          "type": "707"
-+          "type": "708"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[557]",
--      "element-type": "557",
-+      "name": "[558]",
-+      "element-type": "558",
-       "meta-type": "array"
-     },
-     {
--      "name": "557",
-+      "name": "558",
-       "members": [
-         {
-           "name": "name",
-@@ -17580,12 +17615,12 @@
-         },
-         {
-           "name": "type",
--          "type": "708"
-+          "type": "709"
-         },
-         {
-           "name": "unit",
-           "default": null,
--          "type": "709"
-+          "type": "710"
-         },
-         {
-           "name": "base",
-@@ -17605,7 +17640,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "558",
-+      "name": "559",
-       "members": [
-         {
-           "name": "transports",
-@@ -17625,7 +17660,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "559",
-+      "name": "560",
-       "members": [
-         {
-           "name": "statuses",
-@@ -17640,7 +17675,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "560",
-+      "name": "561",
-       "members": [
-         {
-           "name": "n-mem-sections",
-@@ -17660,19 +17695,19 @@
-         },
-         {
-           "name": "features",
--          "type": "558"
-+          "type": "559"
-         },
-         {
-           "name": "acked-features",
--          "type": "558"
-+          "type": "559"
-         },
-         {
-           "name": "backend-features",
--          "type": "558"
-+          "type": "559"
-         },
-         {
-           "name": "protocol-features",
--          "type": "710"
-+          "type": "711"
-         },
-         {
-           "name": "max-queues",
-@@ -17694,12 +17729,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[561]",
--      "element-type": "561",
-+      "name": "[562]",
-+      "element-type": "562",
-       "meta-type": "array"
-     },
-     {
--      "name": "561",
-+      "name": "562",
-       "members": [
-         {
-           "name": "addr",
-@@ -17717,7 +17752,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "562",
-+      "name": "563",
-       "members": [
-         {
-           "name": "flags",
-@@ -17735,7 +17770,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "563",
-+      "name": "564",
-       "members": [
-         {
-           "name": "flags",
-@@ -17749,7 +17784,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "564",
-+      "name": "565",
-       "members": [
-         {
-           "name": "stop"
-@@ -17785,12 +17820,12 @@
-       ]
-     },
-     {
--      "name": "[565]",
--      "element-type": "565",
-+      "name": "[566]",
-+      "element-type": "566",
-       "meta-type": "array"
-     },
-     {
--      "name": "565",
-+      "name": "566",
-       "members": [
-         {
-           "name": "cipher"
-@@ -17818,12 +17853,12 @@
-       ]
-     },
-     {
--      "name": "[566]",
--      "element-type": "566",
-+      "name": "[567]",
-+      "element-type": "567",
-       "meta-type": "array"
-     },
-     {
--      "name": "566",
-+      "name": "567",
-       "members": [
-         {
-           "name": "queue",
-@@ -17831,13 +17866,13 @@
-         },
-         {
-           "name": "type",
--          "type": "711"
-+          "type": "712"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "567",
-+      "name": "568",
-       "members": [
-         {
-           "name": "informational"
-@@ -17861,16 +17896,16 @@
-       ]
-     },
-     {
--      "name": "[568]",
--      "element-type": "568",
-+      "name": "[569]",
-+      "element-type": "569",
-       "meta-type": "array"
-     },
-     {
--      "name": "568",
-+      "name": "569",
-       "members": [
-         {
-           "name": "type",
--          "type": "712"
-+          "type": "713"
-         },
-         {
-           "name": "header",
-@@ -17880,7 +17915,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "569",
-+      "name": "570",
-       "members": [
-         {
-           "name": "cache-data-ecc"
-@@ -17916,7 +17951,7 @@
-       ]
-     },
-     {
--      "name": "570",
-+      "name": "571",
-       "members": [
-         {
-           "name": "free"
-@@ -17940,12 +17975,12 @@
-       ]
-     },
-     {
--      "name": "[571]",
--      "element-type": "571",
-+      "name": "[572]",
-+      "element-type": "572",
-       "meta-type": "array"
-     },
-     {
--      "name": "571",
-+      "name": "572",
-       "members": [
-         {
-           "name": "offset",
-@@ -17959,7 +17994,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "572",
-+      "name": "573",
-       "members": [
-         {
-           "name": "tag-based"
-@@ -17975,7 +18010,7 @@
-       ]
-     },
-     {
--      "name": "573",
-+      "name": "574",
-       "members": [
-         {
-           "name": "hyper-v"
-@@ -17991,7 +18026,7 @@
-       ]
-     },
-     {
--      "name": "574",
-+      "name": "575",
-       "members": [
-         {
-           "name": "arg1",
-@@ -18017,7 +18052,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "575",
-+      "name": "576",
-       "members": [
-         {
-           "name": "core",
-@@ -18033,18 +18068,18 @@
-         },
-         {
-           "name": "reason",
--          "type": "713"
-+          "type": "714"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[576]",
--      "element-type": "576",
-+      "name": "[577]",
-+      "element-type": "577",
-       "meta-type": "array"
-     },
-     {
--      "name": "576",
-+      "name": "577",
-       "members": [
-         {
-           "name": "interval_length",
-@@ -18114,7 +18149,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "577",
-+      "name": "578",
-       "members": [
-         {
-           "name": "boundaries",
-@@ -18128,7 +18163,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "578",
-+      "name": "579",
-       "members": [
-         {
-           "name": "discard-nb-ok",
-@@ -18146,7 +18181,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "579",
-+      "name": "580",
-       "members": [
-         {
-           "name": "completion-errors",
-@@ -18164,45 +18199,45 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[78]",
--      "element-type": "78",
-+      "name": "[79]",
-+      "element-type": "79",
-       "meta-type": "array"
-     },
-     {
--      "name": "580",
-+      "name": "581",
-       "tag": "type",
-       "variants": [
-         {
-           "case": "qcow2",
--          "type": "715"
-+          "type": "716"
-         },
-         {
-           "case": "vmdk",
--          "type": "716"
-+          "type": "717"
-         },
-         {
-           "case": "luks",
--          "type": "717"
-+          "type": "718"
-         },
-         {
-           "case": "rbd",
--          "type": "718"
-+          "type": "719"
-         },
-         {
-           "case": "file",
--          "type": "719"
-+          "type": "720"
-         }
-       ],
-       "members": [
-         {
-           "name": "type",
--          "type": "714"
-+          "type": "715"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "581",
-+      "name": "582",
-       "members": [
-         {
-           "name": "block-backend"
-@@ -18222,12 +18257,12 @@
-       ]
-     },
-     {
--      "name": "[582]",
--      "element-type": "582",
-+      "name": "[583]",
-+      "element-type": "583",
-       "meta-type": "array"
-     },
-     {
--      "name": "582",
-+      "name": "583",
-       "members": [
-         {
-           "name": "consistent-read"
-@@ -18251,7 +18286,7 @@
-       ]
-     },
-     {
--      "name": "583",
-+      "name": "584",
-       "members": [
-         {
-           "type": "58"
-@@ -18263,16 +18298,16 @@
-       "meta-type": "alternate"
-     },
-     {
--      "name": "[584]",
--      "element-type": "584",
-+      "name": "[585]",
-+      "element-type": "585",
-       "meta-type": "array"
-     },
-     {
--      "name": "584",
-+      "name": "585",
-       "members": [
-         {
-           "name": "event",
--          "type": "720"
-+          "type": "721"
-         },
-         {
-           "name": "state",
-@@ -18282,7 +18317,7 @@
-         {
-           "name": "iotype",
-           "default": null,
--          "type": "721"
-+          "type": "722"
-         },
-         {
-           "name": "errno",
-@@ -18308,16 +18343,16 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[585]",
--      "element-type": "585",
-+      "name": "[586]",
-+      "element-type": "586",
-       "meta-type": "array"
-     },
-     {
--      "name": "585",
-+      "name": "586",
-       "members": [
-         {
-           "name": "event",
--          "type": "720"
-+          "type": "721"
-         },
-         {
-           "name": "state",
-@@ -18332,7 +18367,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "586",
-+      "name": "587",
-       "members": [
-         {
-           "name": "break-guest-write"
-@@ -18348,7 +18383,7 @@
-       ]
-     },
-     {
--      "name": "587",
-+      "name": "588",
-       "members": [
-         {
-           "name": "auto"
-@@ -18368,7 +18403,7 @@
-       ]
-     },
-     {
--      "name": "588",
-+      "name": "589",
-       "members": [
-         {
-           "name": "threads"
-@@ -18388,7 +18423,7 @@
-       ]
-     },
-     {
--      "name": "589",
-+      "name": "590",
-       "members": [
-         {
-           "name": "tcp"
-@@ -18404,7 +18439,7 @@
-       ]
-     },
-     {
--      "name": "590",
-+      "name": "591",
-       "members": [
-         {
-           "name": "crc32c"
-@@ -18428,11 +18463,11 @@
-       ]
-     },
-     {
--      "name": "591",
-+      "name": "592",
-       "members": [
-         {
-           "name": "type",
--          "type": "722"
-+          "type": "723"
-         },
-         {
-           "name": "host",
-@@ -18442,7 +18477,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "592",
-+      "name": "593",
-       "members": [
-         {
-           "type": "58"
-@@ -18457,62 +18492,62 @@
-       "meta-type": "alternate"
-     },
-     {
--      "name": "593",
-+      "name": "594",
-       "members": [
-         {
--          "type": "723"
-+          "type": "724"
-         },
-         {
--          "type": "724"
-+          "type": "725"
-         }
-       ],
-       "meta-type": "alternate"
-     },
-     {
--      "name": "594",
-+      "name": "595",
-       "tag": "format",
-       "variants": [
-         {
-           "case": "aes",
--          "type": "726"
-+          "type": "727"
-         },
-         {
-           "case": "luks",
--          "type": "727"
-+          "type": "728"
-         }
-       ],
-       "members": [
-         {
-           "name": "format",
--          "type": "725"
-+          "type": "726"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "595",
-+      "name": "596",
-       "tag": "format",
-       "variants": [
-         {
-           "case": "aes",
--          "type": "726"
-+          "type": "727"
-         }
-       ],
-       "members": [
-         {
-           "name": "format",
--          "type": "728"
-+          "type": "729"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[583]",
--      "element-type": "583",
-+      "name": "[584]",
-+      "element-type": "584",
-       "meta-type": "array"
-     },
-     {
--      "name": "596",
-+      "name": "597",
-       "members": [
-         {
-           "name": "quorum"
-@@ -18528,42 +18563,42 @@
-       ]
-     },
-     {
--      "name": "597",
-+      "name": "598",
-       "tag": "format",
-       "variants": [
-         {
-           "case": "luks",
--          "type": "730"
-+          "type": "731"
-         },
-         {
-           "case": "luks2",
--          "type": "731"
-+          "type": "732"
-         },
-         {
-           "case": "luks-any",
--          "type": "732"
-+          "type": "733"
-         }
-       ],
-       "members": [
-         {
-           "name": "format",
--          "type": "729"
-+          "type": "730"
-         },
-         {
-           "name": "parent",
-           "default": null,
--          "type": "597"
-+          "type": "598"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[598]",
--      "element-type": "598",
-+      "name": "[599]",
-+      "element-type": "599",
-       "meta-type": "array"
-     },
-     {
--      "name": "598",
-+      "name": "599",
-       "members": [
-         {
-           "name": "cephx"
-@@ -18579,12 +18614,12 @@
-       ]
-     },
-     {
--      "name": "[599]",
--      "element-type": "599",
-+      "name": "[600]",
-+      "element-type": "600",
-       "meta-type": "array"
-     },
-     {
--      "name": "599",
-+      "name": "600",
-       "members": [
-         {
-           "name": "host",
-@@ -18598,7 +18633,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "600",
-+      "name": "601",
-       "members": [
-         {
-           "name": "primary"
-@@ -18614,7 +18649,7 @@
-       ]
-     },
-     {
--      "name": "601",
-+      "name": "602",
-       "members": [
-         {
-           "name": "host",
-@@ -18658,12 +18693,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "602",
-+      "name": "603",
-       "tag": "mode",
-       "variants": [
-         {
-           "case": "hash",
--          "type": "734"
-+          "type": "735"
-         },
-         {
-           "case": "none",
-@@ -18677,13 +18712,13 @@
-       "members": [
-         {
-           "name": "mode",
--          "type": "733"
-+          "type": "734"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "603",
-+      "name": "604",
-       "members": [
-         {
-           "name": "filename",
-@@ -18696,7 +18731,7 @@
-         {
-           "name": "preallocation",
-           "default": null,
--          "type": "735"
-+          "type": "736"
-         },
-         {
-           "name": "nocow",
-@@ -18712,11 +18747,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "604",
-+      "name": "605",
-       "members": [
-         {
-           "name": "location",
--          "type": "330"
-+          "type": "331"
-         },
-         {
-           "name": "size",
-@@ -18725,13 +18760,13 @@
-         {
-           "name": "preallocation",
-           "default": null,
--          "type": "735"
-+          "type": "736"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "605",
-+      "name": "606",
-       "members": [
-         {
-           "name": "key-secret",
-@@ -18741,27 +18776,27 @@
-         {
-           "name": "cipher-alg",
-           "default": null,
--          "type": "736"
-+          "type": "737"
-         },
-         {
-           "name": "cipher-mode",
-           "default": null,
--          "type": "737"
-+          "type": "738"
-         },
-         {
-           "name": "ivgen-alg",
-           "default": null,
--          "type": "738"
-+          "type": "739"
-         },
-         {
-           "name": "ivgen-hash-alg",
-           "default": null,
--          "type": "739"
-+          "type": "740"
-         },
-         {
-           "name": "hash-alg",
-           "default": null,
--          "type": "739"
-+          "type": "740"
-         },
-         {
-           "name": "iter-time",
-@@ -18771,12 +18806,12 @@
-         {
-           "name": "file",
-           "default": null,
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "header",
-           "default": null,
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "size",
-@@ -18785,17 +18820,17 @@
-         {
-           "name": "preallocation",
-           "default": null,
--          "type": "735"
-+          "type": "736"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "606",
-+      "name": "607",
-       "members": [
-         {
-           "name": "location",
--          "type": "337"
-+          "type": "338"
-         },
-         {
-           "name": "size",
-@@ -18805,11 +18840,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "607",
-+      "name": "608",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "size",
-@@ -18824,11 +18859,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "608",
-+      "name": "609",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "size",
-@@ -18842,22 +18877,22 @@
-         {
-           "name": "encrypt",
-           "default": null,
--          "type": "740"
-+          "type": "741"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "609",
-+      "name": "610",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "data-file",
-           "default": null,
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "data-file-raw",
-@@ -18876,7 +18911,7 @@
-         {
-           "name": "version",
-           "default": null,
--          "type": "741"
-+          "type": "742"
-         },
-         {
-           "name": "backing-file",
-@@ -18886,12 +18921,12 @@
-         {
-           "name": "backing-fmt",
-           "default": null,
--          "type": "317"
-+          "type": "318"
-         },
-         {
-           "name": "encrypt",
-           "default": null,
--          "type": "740"
-+          "type": "741"
-         },
-         {
-           "name": "cluster-size",
-@@ -18901,7 +18936,7 @@
-         {
-           "name": "preallocation",
-           "default": null,
--          "type": "735"
-+          "type": "736"
-         },
-         {
-           "name": "lazy-refcounts",
-@@ -18916,17 +18951,17 @@
-         {
-           "name": "compression-type",
-           "default": null,
--          "type": "742"
-+          "type": "743"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "610",
-+      "name": "611",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "size",
-@@ -18940,7 +18975,7 @@
-         {
-           "name": "backing-fmt",
-           "default": null,
--          "type": "317"
-+          "type": "318"
-         },
-         {
-           "name": "cluster-size",
-@@ -18956,11 +18991,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "611",
-+      "name": "612",
-       "members": [
-         {
-           "name": "location",
--          "type": "347"
-+          "type": "348"
-         },
-         {
-           "name": "size",
-@@ -18974,17 +19009,17 @@
-         {
-           "name": "encrypt",
-           "default": null,
--          "type": "743"
-+          "type": "744"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "612",
-+      "name": "613",
-       "members": [
-         {
-           "name": "location",
--          "type": "349"
-+          "type": "350"
-         },
-         {
-           "name": "size",
-@@ -18994,11 +19029,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "613",
-+      "name": "614",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "size",
-@@ -19007,17 +19042,17 @@
-         {
-           "name": "preallocation",
-           "default": null,
--          "type": "735"
-+          "type": "736"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "614",
-+      "name": "615",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "size",
-@@ -19036,7 +19071,7 @@
-         {
-           "name": "subformat",
-           "default": null,
--          "type": "744"
-+          "type": "745"
-         },
-         {
-           "name": "block-state-zero",
-@@ -19047,11 +19082,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "615",
-+      "name": "616",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "size",
-@@ -19060,12 +19095,12 @@
-         {
-           "name": "extents",
-           "default": null,
--          "type": "[583]"
-+          "type": "[584]"
-         },
-         {
-           "name": "subformat",
-           "default": null,
--          "type": "745"
-+          "type": "746"
-         },
-         {
-           "name": "backing-file",
-@@ -19075,7 +19110,7 @@
-         {
-           "name": "adapter-type",
-           "default": null,
--          "type": "746"
-+          "type": "747"
-         },
-         {
-           "name": "hwversion",
-@@ -19096,11 +19131,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "616",
-+      "name": "617",
-       "members": [
-         {
-           "name": "file",
--          "type": "583"
-+          "type": "584"
-         },
-         {
-           "name": "size",
-@@ -19109,7 +19144,7 @@
-         {
-           "name": "subformat",
-           "default": null,
--          "type": "747"
-+          "type": "748"
-         },
-         {
-           "name": "force-size",
-@@ -19120,11 +19155,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "617",
-+      "name": "618",
-       "members": [
-         {
-           "name": "state",
--          "type": "748"
-+          "type": "749"
-         },
-         {
-           "name": "new-secret",
-@@ -19155,12 +19190,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "618",
-+      "name": "619",
-       "members": [
-         {
-           "name": "encrypt",
-           "default": null,
--          "type": "749"
-+          "type": "750"
-         }
-       ],
-       "meta-type": "object"
-@@ -19171,7 +19206,7 @@
-       "meta-type": "builtin"
-     },
-     {
--      "name": "619",
-+      "name": "620",
-       "members": [
-         {
-           "name": "inet"
-@@ -19195,47 +19230,47 @@
-       ]
-     },
-     {
--      "name": "620",
-+      "name": "621",
-       "members": [
-         {
-           "name": "data",
--          "type": "601"
-+          "type": "602"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "621",
-+      "name": "622",
-       "members": [
-         {
-           "name": "data",
--          "type": "643"
-+          "type": "644"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "622",
-+      "name": "623",
-       "members": [
-         {
-           "name": "data",
--          "type": "644"
-+          "type": "645"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "623",
-+      "name": "624",
-       "members": [
-         {
-           "name": "data",
--          "type": "645"
-+          "type": "646"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "624",
-+      "name": "625",
-       "members": [
-         {
-           "name": "off"
-@@ -19255,7 +19290,7 @@
-       ]
-     },
-     {
--      "name": "625",
-+      "name": "626",
-       "members": [
-         {
-           "name": "file"
-@@ -19353,16 +19388,6 @@
-         "memory"
-       ]
-     },
--    {
--      "name": "626",
--      "members": [
--        {
--          "name": "data",
--          "type": "750"
--        }
--      ],
--      "meta-type": "object"
--    },
-     {
-       "name": "627",
-       "members": [
-@@ -19504,12 +19529,22 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[641]",
--      "element-type": "641",
-+      "name": "641",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "765"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[642]",
-+      "element-type": "642",
-       "meta-type": "array"
-     },
-     {
--      "name": "641",
-+      "name": "642",
-       "members": [
-         {
-           "name": "str",
-@@ -19519,7 +19554,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "643",
-+      "name": "644",
-       "members": [
-         {
-           "name": "path",
-@@ -19539,7 +19574,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "644",
-+      "name": "645",
-       "members": [
-         {
-           "name": "cid",
-@@ -19553,7 +19588,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "645",
-+      "name": "646",
-       "members": [
-         {
-           "name": "str",
-@@ -19563,27 +19598,27 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "646",
-+      "name": "647",
-       "members": [
-         {
-           "name": "data",
--          "type": "765"
-+          "type": "766"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "647",
-+      "name": "648",
-       "members": [
-         {
-           "name": "data",
--          "type": "766"
-+          "type": "767"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "648",
-+      "name": "649",
-       "members": [
-         {
-           "name": "number"
-@@ -19599,7 +19634,7 @@
-       ]
-     },
-     {
--      "name": "649",
-+      "name": "650",
-       "members": [
-         {
-           "name": "data",
-@@ -19609,17 +19644,17 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "650",
-+      "name": "651",
-       "members": [
-         {
-           "name": "data",
--          "type": "767"
-+          "type": "768"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "651",
-+      "name": "652",
-       "members": [
-         {
-           "name": "key"
-@@ -19647,47 +19682,47 @@
-       ]
-     },
-     {
--      "name": "652",
-+      "name": "653",
-       "members": [
-         {
-           "name": "data",
--          "type": "768"
-+          "type": "769"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "653",
-+      "name": "654",
-       "members": [
-         {
-           "name": "data",
--          "type": "769"
-+          "type": "770"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "654",
-+      "name": "655",
-       "members": [
-         {
-           "name": "data",
--          "type": "770"
-+          "type": "771"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "655",
-+      "name": "656",
-       "members": [
-         {
-           "name": "data",
--          "type": "771"
-+          "type": "772"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "656",
-+      "name": "657",
-       "members": [
-         {
-           "name": "lctrl-lalt"
-@@ -19712,12 +19747,12 @@
-       "meta-type": "builtin"
-     },
-     {
--      "name": "[657]",
--      "element-type": "657",
-+      "name": "[658]",
-+      "element-type": "658",
-       "meta-type": "array"
-     },
-     {
--      "name": "657",
-+      "name": "658",
-       "members": [
-         {
-           "name": "name",
-@@ -19730,13 +19765,13 @@
-         {
-           "name": "transform",
-           "default": null,
--          "type": "772"
-+          "type": "773"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "658",
-+      "name": "659",
-       "members": [
-         {
-           "name": "main"
-@@ -19752,36 +19787,36 @@
-       ]
-     },
-     {
--      "name": "659",
-+      "name": "660",
-       "tag": "transport",
-       "variants": [
-         {
-           "case": "socket",
--          "type": "391"
-+          "type": "392"
-         },
-         {
-           "case": "exec",
--          "type": "774"
-+          "type": "775"
-         },
-         {
-           "case": "rdma",
--          "type": "601"
-+          "type": "602"
-         },
-         {
-           "case": "file",
--          "type": "775"
-+          "type": "776"
-         }
-       ],
-       "members": [
-         {
-           "name": "transport",
--          "type": "773"
-+          "type": "774"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "660",
-+      "name": "661",
-       "members": [
-         {
-           "name": "abort"
-@@ -19840,17 +19875,17 @@
-       ]
-     },
-     {
--      "name": "661",
-+      "name": "662",
-       "members": [
-         {
-           "name": "data",
--          "type": "776"
-+          "type": "777"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "662",
-+      "name": "663",
-       "members": [
-         {
-           "name": "data",
-@@ -19860,7 +19895,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "663",
-+      "name": "664",
-       "members": [
-         {
-           "name": "data",
-@@ -19870,7 +19905,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "664",
-+      "name": "665",
-       "members": [
-         {
-           "name": "data",
-@@ -19880,7 +19915,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "665",
-+      "name": "666",
-       "members": [
-         {
-           "name": "data",
-@@ -19890,7 +19925,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "666",
-+      "name": "667",
-       "members": [
-         {
-           "name": "data",
-@@ -19900,17 +19935,17 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "667",
-+      "name": "668",
-       "members": [
-         {
-           "name": "data",
--          "type": "76"
-+          "type": "77"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "668",
-+      "name": "669",
-       "members": [
-         {
-           "name": "data",
-@@ -19920,7 +19955,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "669",
-+      "name": "670",
-       "members": [
-         {
-           "name": "data",
-@@ -19930,7 +19965,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "670",
-+      "name": "671",
-       "members": [
-         {
-           "name": "individual"
-@@ -19946,7 +19981,7 @@
-       ]
-     },
-     {
--      "name": "671",
-+      "name": "672",
-       "members": [
-         {
-           "name": "string"
-@@ -19986,12 +20021,12 @@
-       ]
-     },
-     {
--      "name": "[672]",
--      "element-type": "672",
-+      "name": "[673]",
-+      "element-type": "673",
-       "meta-type": "array"
-     },
-     {
--      "name": "672",
-+      "name": "673",
-       "members": [
-         {
-           "name": "name",
-@@ -20006,12 +20041,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[673]",
--      "element-type": "673",
-+      "name": "[674]",
-+      "element-type": "674",
-       "meta-type": "array"
-     },
-     {
--      "name": "673",
-+      "name": "674",
-       "members": [
-         {
-           "name": "name",
-@@ -20035,12 +20070,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[674]",
--      "element-type": "674",
-+      "name": "[675]",
-+      "element-type": "675",
-       "meta-type": "array"
-     },
-     {
--      "name": "674",
-+      "name": "675",
-       "members": [
-         {
-           "name": "case",
-@@ -20054,12 +20089,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[675]",
--      "element-type": "675",
-+      "name": "[676]",
-+      "element-type": "676",
-       "meta-type": "array"
-     },
-     {
--      "name": "675",
-+      "name": "676",
-       "members": [
-         {
-           "name": "type",
-@@ -20069,7 +20104,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "676",
-+      "name": "677",
-       "members": [
-         {
-           "name": "deny"
-@@ -20085,12 +20120,12 @@
-       ]
-     },
-     {
--      "name": "[677]",
--      "element-type": "677",
-+      "name": "[678]",
-+      "element-type": "678",
-       "meta-type": "array"
-     },
-     {
--      "name": "677",
-+      "name": "678",
-       "members": [
-         {
-           "name": "match",
-@@ -20098,18 +20133,18 @@
-         },
-         {
-           "name": "policy",
--          "type": "676"
-+          "type": "677"
-         },
-         {
-           "name": "format",
-           "default": null,
--          "type": "777"
-+          "type": "778"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "678",
-+      "name": "679",
-       "members": [
-         {
-           "name": "all"
-@@ -20129,7 +20164,7 @@
-       ]
-     },
-     {
--      "name": "679",
-+      "name": "680",
-       "members": [
-         {
-           "name": "before"
-@@ -20145,7 +20180,7 @@
-       ]
-     },
-     {
--      "name": "680",
-+      "name": "681",
-       "members": [
-         {
-           "name": "ctrl-ctrl"
-@@ -20177,7 +20212,7 @@
-       ]
-     },
-     {
--      "name": "681",
-+      "name": "682",
-       "members": [
-         {
-           "name": "raw"
-@@ -20193,7 +20228,7 @@
-       ]
-     },
-     {
--      "name": "682",
-+      "name": "683",
-       "members": [
-         {
-           "name": "iops-total",
-@@ -20294,7 +20329,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "683",
-+      "name": "684",
-       "members": [
-         {
-           "name": "client"
-@@ -20310,7 +20345,7 @@
-       ]
-     },
-     {
--      "name": "684",
-+      "name": "685",
-       "members": [
-         {
-           "name": "uninitialized"
-@@ -20338,7 +20373,7 @@
-       ]
-     },
-     {
--      "name": "685",
-+      "name": "686",
-       "members": [
-         {
-           "name": "memory"
-@@ -20362,7 +20397,7 @@
-       ]
-     },
-     {
--      "name": "686",
-+      "name": "687",
-       "members": [
-         {
-           "name": "access-latency"
-@@ -20394,7 +20429,7 @@
-       ]
-     },
-     {
--      "name": "687",
-+      "name": "688",
-       "members": [
-         {
-           "name": "none"
-@@ -20414,7 +20449,7 @@
-       ]
-     },
-     {
--      "name": "688",
-+      "name": "689",
-       "members": [
-         {
-           "name": "none"
-@@ -20434,7 +20469,7 @@
-       ]
-     },
-     {
--      "name": "689",
-+      "name": "690",
-       "members": [
-         {
-           "name": "id",
-@@ -20473,7 +20508,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "690",
-+      "name": "691",
-       "members": [
-         {
-           "name": "id",
-@@ -20496,7 +20531,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "691",
-+      "name": "692",
-       "members": [
-         {
-           "name": "id",
-@@ -20535,7 +20570,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "692",
-+      "name": "693",
-       "members": [
-         {
-           "name": "id",
-@@ -20562,7 +20597,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "693",
-+      "name": "694",
-       "members": [
-         {
-           "name": "id",
-@@ -20587,7 +20622,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "694",
-+      "name": "695",
-       "members": [
-         {
-           "name": "string"
-@@ -20611,7 +20646,7 @@
-       ]
-     },
-     {
--      "name": "695",
-+      "name": "696",
-       "members": [
-         {
-           "name": "mixing-engine",
-@@ -20641,7 +20676,7 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "778"
-+          "type": "779"
-         },
-         {
-           "name": "buffer-length",
-@@ -20652,7 +20687,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "696",
-+      "name": "697",
-       "members": [
-         {
-           "name": "mixing-engine",
-@@ -20682,7 +20717,7 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "778"
-+          "type": "779"
-         },
-         {
-           "name": "buffer-length",
-@@ -20708,7 +20743,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "697",
-+      "name": "698",
-       "members": [
-         {
-           "name": "mixing-engine",
-@@ -20738,7 +20773,7 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "778"
-+          "type": "779"
-         },
-         {
-           "name": "buffer-length",
-@@ -20754,7 +20789,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "698",
-+      "name": "699",
-       "members": [
-         {
-           "name": "mixing-engine",
-@@ -20784,7 +20819,7 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "778"
-+          "type": "779"
-         },
-         {
-           "name": "buffer-length",
-@@ -20820,7 +20855,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "699",
-+      "name": "700",
-       "members": [
-         {
-           "name": "mixing-engine",
-@@ -20850,7 +20885,7 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "778"
-+          "type": "779"
-         },
-         {
-           "name": "buffer-length",
-@@ -20876,7 +20911,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "700",
-+      "name": "701",
-       "members": [
-         {
-           "name": "mixing-engine",
-@@ -20906,7 +20941,7 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "778"
-+          "type": "779"
-         },
-         {
-           "name": "buffer-length",
-@@ -20932,7 +20967,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "701",
-+      "name": "702",
-       "members": [
-         {
-           "name": "mixing-engine",
-@@ -20962,7 +20997,7 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "778"
-+          "type": "779"
-         },
-         {
-           "name": "buffer-length",
-@@ -20988,7 +21023,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "702",
-+      "name": "703",
-       "members": [
-         {
-           "name": "mixing-engine",
-@@ -21018,7 +21053,7 @@
-         {
-           "name": "format",
-           "default": null,
--          "type": "778"
-+          "type": "779"
-         },
-         {
-           "name": "buffer-length",
-@@ -21034,7 +21069,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "703",
-+      "name": "704",
-       "members": [
-         {
-           "name": "desc",
-@@ -21049,7 +21084,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "704",
-+      "name": "705",
-       "members": [
-         {
-           "name": "device",
-@@ -21073,27 +21108,27 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "705",
-+      "name": "706",
-       "members": [
-         {
-           "name": "bus",
--          "type": "779"
-+          "type": "780"
-         },
-         {
-           "name": "devices",
-           "default": null,
--          "type": "[551]"
-+          "type": "[552]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[706]",
--      "element-type": "706",
-+      "name": "[707]",
-+      "element-type": "707",
-       "meta-type": "array"
-     },
-     {
--      "name": "706",
-+      "name": "707",
-       "members": [
-         {
-           "name": "bar",
-@@ -21125,7 +21160,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "707",
-+      "name": "708",
-       "members": [
-         {
-           "type": "int"
-@@ -21140,7 +21175,7 @@
-       "meta-type": "alternate"
-     },
-     {
--      "name": "708",
-+      "name": "709",
-       "members": [
-         {
-           "name": "cumulative"
-@@ -21168,7 +21203,7 @@
-       ]
-     },
-     {
--      "name": "709",
-+      "name": "710",
-       "members": [
-         {
-           "name": "bytes"
-@@ -21192,7 +21227,7 @@
-       ]
-     },
-     {
--      "name": "710",
-+      "name": "711",
-       "members": [
-         {
-           "name": "protocols",
-@@ -21207,7 +21242,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "711",
-+      "name": "712",
-       "members": [
-         {
-           "name": "builtin"
-@@ -21227,7 +21262,7 @@
-       ]
-     },
-     {
--      "name": "712",
-+      "name": "713",
-       "members": [
-         {
-           "name": "cache-data-parity"
-@@ -21295,7 +21330,7 @@
-       ]
-     },
-     {
--      "name": "713",
-+      "name": "714",
-       "members": [
-         {
-           "name": "unknown"
-@@ -21323,7 +21358,7 @@
-       ]
-     },
-     {
--      "name": "714",
-+      "name": "715",
-       "members": [
-         {
-           "name": "qcow2"
-@@ -21350,16 +21385,6 @@
-         "file"
-       ]
-     },
--    {
--      "name": "715",
--      "members": [
--        {
--          "name": "data",
--          "type": "780"
--        }
--      ],
--      "meta-type": "object"
--    },
-     {
-       "name": "716",
-       "members": [
-@@ -21402,6 +21427,16 @@
-     },
-     {
-       "name": "720",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "785"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "721",
-       "members": [
-         {
-           "name": "l1_update"
-@@ -21601,7 +21636,7 @@
-       ]
-     },
-     {
--      "name": "721",
-+      "name": "722",
-       "members": [
-         {
-           "name": "read"
-@@ -21633,7 +21668,7 @@
-       ]
-     },
-     {
--      "name": "722",
-+      "name": "723",
-       "members": [
-         {
-           "name": "inet"
-@@ -21645,12 +21680,12 @@
-       ]
-     },
-     {
--      "name": "723",
-+      "name": "724",
-       "members": [
-         {
-           "name": "template",
-           "default": null,
--          "type": "724"
-+          "type": "725"
-         },
-         {
-           "name": "main-header",
-@@ -21701,7 +21736,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "724",
-+      "name": "725",
-       "members": [
-         {
-           "name": "none"
-@@ -21725,7 +21760,7 @@
-       ]
-     },
-     {
--      "name": "725",
-+      "name": "726",
-       "members": [
-         {
-           "name": "aes"
-@@ -21741,7 +21776,7 @@
-       ]
-     },
-     {
--      "name": "726",
-+      "name": "727",
-       "members": [
-         {
-           "name": "key-secret",
-@@ -21752,7 +21787,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "727",
-+      "name": "728",
-       "members": [
-         {
-           "name": "key-secret",
-@@ -21763,7 +21798,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "728",
-+      "name": "729",
-       "members": [
-         {
-           "name": "aes"
-@@ -21775,7 +21810,7 @@
-       ]
-     },
-     {
--      "name": "729",
-+      "name": "730",
-       "members": [
-         {
-           "name": "luks"
-@@ -21795,7 +21830,7 @@
-       ]
-     },
-     {
--      "name": "730",
-+      "name": "731",
-       "members": [
-         {
-           "name": "key-secret",
-@@ -21805,7 +21840,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "731",
-+      "name": "732",
-       "members": [
-         {
-           "name": "key-secret",
-@@ -21815,7 +21850,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "732",
-+      "name": "733",
-       "members": [
-         {
-           "name": "key-secret",
-@@ -21825,7 +21860,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "733",
-+      "name": "734",
-       "members": [
-         {
-           "name": "none"
-@@ -21845,11 +21880,11 @@
-       ]
-     },
-     {
--      "name": "734",
-+      "name": "735",
-       "members": [
-         {
-           "name": "type",
--          "type": "785"
-+          "type": "786"
-         },
-         {
-           "name": "hash",
-@@ -21859,7 +21894,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "735",
-+      "name": "736",
-       "members": [
-         {
-           "name": "off"
-@@ -21883,7 +21918,7 @@
-       ]
-     },
-     {
--      "name": "736",
-+      "name": "737",
-       "members": [
-         {
-           "name": "aes-128"
-@@ -21943,7 +21978,7 @@
-       ]
-     },
-     {
--      "name": "737",
-+      "name": "738",
-       "members": [
-         {
-           "name": "ecb"
-@@ -21967,7 +22002,7 @@
-       ]
-     },
-     {
--      "name": "738",
-+      "name": "739",
-       "members": [
-         {
-           "name": "plain"
-@@ -21987,7 +22022,7 @@
-       ]
-     },
-     {
--      "name": "739",
-+      "name": "740",
-       "members": [
-         {
-           "name": "md5"
-@@ -22027,28 +22062,28 @@
-       ]
-     },
-     {
--      "name": "740",
-+      "name": "741",
-       "tag": "format",
-       "variants": [
-         {
-           "case": "qcow",
--          "type": "726"
-+          "type": "727"
-         },
-         {
-           "case": "luks",
--          "type": "787"
-+          "type": "788"
-         }
-       ],
-       "members": [
-         {
-           "name": "format",
--          "type": "786"
-+          "type": "787"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "741",
-+      "name": "742",
-       "members": [
-         {
-           "name": "v2"
-@@ -22064,7 +22099,7 @@
-       ]
-     },
-     {
--      "name": "742",
-+      "name": "743",
-       "members": [
-         {
-           "name": "zlib"
-@@ -22080,16 +22115,16 @@
-       ]
-     },
-     {
--      "name": "743",
-+      "name": "744",
-       "tag": "format",
-       "variants": [
-         {
-           "case": "luks",
--          "type": "788"
-+          "type": "789"
-         },
-         {
-           "case": "luks2",
--          "type": "789"
-+          "type": "790"
-         },
-         {
-           "case": "luks-any",
-@@ -22099,13 +22134,13 @@
-       "members": [
-         {
-           "name": "format",
--          "type": "729"
-+          "type": "730"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "744",
-+      "name": "745",
-       "members": [
-         {
-           "name": "dynamic"
-@@ -22121,7 +22156,7 @@
-       ]
-     },
-     {
--      "name": "745",
-+      "name": "746",
-       "members": [
-         {
-           "name": "monolithicSparse"
-@@ -22149,7 +22184,7 @@
-       ]
-     },
-     {
--      "name": "746",
-+      "name": "747",
-       "members": [
-         {
-           "name": "ide"
-@@ -22173,7 +22208,7 @@
-       ]
-     },
-     {
--      "name": "747",
-+      "name": "748",
-       "members": [
-         {
-           "name": "dynamic"
-@@ -22189,7 +22224,7 @@
-       ]
-     },
-     {
--      "name": "748",
-+      "name": "749",
-       "members": [
-         {
-           "name": "active"
-@@ -22205,12 +22240,12 @@
-       ]
-     },
-     {
--      "name": "749",
-+      "name": "750",
-       "tag": "format",
-       "variants": [
-         {
-           "case": "luks",
--          "type": "790"
-+          "type": "791"
-         },
-         {
-           "case": "qcow",
-@@ -22220,13 +22255,13 @@
-       "members": [
-         {
-           "name": "format",
--          "type": "786"
-+          "type": "787"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "750",
-+      "name": "751",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22256,7 +22291,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "751",
-+      "name": "752",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22276,7 +22311,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "752",
-+      "name": "753",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22290,7 +22325,7 @@
-         },
-         {
-           "name": "addr",
--          "type": "361"
-+          "type": "362"
-         },
-         {
-           "name": "tls-creds",
-@@ -22349,7 +22384,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "753",
-+      "name": "754",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22363,18 +22398,18 @@
-         },
-         {
-           "name": "remote",
--          "type": "361"
-+          "type": "362"
-         },
-         {
-           "name": "local",
-           "default": null,
--          "type": "361"
-+          "type": "362"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "754",
-+      "name": "755",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22395,7 +22430,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "755",
-+      "name": "756",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22411,7 +22446,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "756",
-+      "name": "757",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22431,7 +22466,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "757",
-+      "name": "758",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22451,7 +22486,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "758",
-+      "name": "759",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22472,7 +22507,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "759",
-+      "name": "760",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22492,7 +22527,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "760",
-+      "name": "761",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22512,7 +22547,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "761",
-+      "name": "762",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22538,7 +22573,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "762",
-+      "name": "763",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22558,7 +22593,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "763",
-+      "name": "764",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22594,7 +22629,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "764",
-+      "name": "765",
-       "members": [
-         {
-           "name": "logfile",
-@@ -22615,7 +22650,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "765",
-+      "name": "766",
-       "members": [
-         {
-           "name": "path",
-@@ -22631,7 +22666,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "766",
-+      "name": "767",
-       "members": [
-         {
-           "name": "chardev",
-@@ -22641,7 +22676,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "767",
-+      "name": "768",
-       "members": [
-         {
-           "name": "unmapped"
-@@ -23297,11 +23332,11 @@
-       ]
-     },
-     {
--      "name": "768",
-+      "name": "769",
-       "members": [
-         {
-           "name": "key",
--          "type": "415"
-+          "type": "416"
-         },
-         {
-           "name": "down",
-@@ -23311,11 +23346,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "769",
-+      "name": "770",
-       "members": [
-         {
-           "name": "button",
--          "type": "791"
-+          "type": "792"
-         },
-         {
-           "name": "down",
-@@ -23325,11 +23360,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "770",
-+      "name": "771",
-       "members": [
-         {
-           "name": "axis",
--          "type": "792"
-+          "type": "793"
-         },
-         {
-           "name": "value",
-@@ -23339,11 +23374,11 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "771",
-+      "name": "772",
-       "members": [
-         {
-           "name": "type",
--          "type": "793"
-+          "type": "794"
-         },
-         {
-           "name": "slot",
-@@ -23355,7 +23390,7 @@
-         },
-         {
-           "name": "axis",
--          "type": "792"
-+          "type": "793"
-         },
-         {
-           "name": "value",
-@@ -23365,7 +23400,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "772",
-+      "name": "773",
-       "members": [
-         {
-           "name": "persistent",
-@@ -23376,7 +23411,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "773",
-+      "name": "774",
-       "members": [
-         {
-           "name": "socket"
-@@ -23400,7 +23435,7 @@
-       ]
-     },
-     {
--      "name": "774",
-+      "name": "775",
-       "members": [
-         {
-           "name": "args",
-@@ -23410,7 +23445,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "775",
-+      "name": "776",
-       "members": [
-         {
-           "name": "filename",
-@@ -23424,12 +23459,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "776",
-+      "name": "777",
-       "members": [],
-       "meta-type": "object"
-     },
-     {
--      "name": "777",
-+      "name": "778",
-       "members": [
-         {
-           "name": "exact"
-@@ -23445,7 +23480,7 @@
-       ]
-     },
-     {
--      "name": "778",
-+      "name": "779",
-       "members": [
-         {
-           "name": "u8"
-@@ -23481,7 +23516,7 @@
-       ]
-     },
-     {
--      "name": "779",
-+      "name": "780",
-       "members": [
-         {
-           "name": "number",
-@@ -23497,21 +23532,21 @@
-         },
-         {
-           "name": "io_range",
--          "type": "794"
-+          "type": "795"
-         },
-         {
-           "name": "memory_range",
--          "type": "794"
-+          "type": "795"
-         },
-         {
-           "name": "prefetchable_range",
--          "type": "794"
-+          "type": "795"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "780",
-+      "name": "781",
-       "members": [
-         {
-           "name": "compat",
-@@ -23549,22 +23584,22 @@
-         {
-           "name": "encrypt",
-           "default": null,
--          "type": "795"
-+          "type": "796"
-         },
-         {
-           "name": "bitmaps",
-           "default": null,
--          "type": "[796]"
-+          "type": "[797]"
-         },
-         {
-           "name": "compression-type",
--          "type": "742"
-+          "type": "743"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "781",
-+      "name": "782",
-       "members": [
-         {
-           "name": "create-type",
-@@ -23580,34 +23615,34 @@
-         },
-         {
-           "name": "extents",
--          "type": "[797]"
-+          "type": "[798]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "782",
-+      "name": "783",
-       "members": [
-         {
-           "name": "cipher-alg",
--          "type": "736"
-+          "type": "737"
-         },
-         {
-           "name": "cipher-mode",
--          "type": "737"
-+          "type": "738"
-         },
-         {
-           "name": "ivgen-alg",
--          "type": "738"
-+          "type": "739"
-         },
-         {
-           "name": "ivgen-hash-alg",
-           "default": null,
--          "type": "739"
-+          "type": "740"
-         },
-         {
-           "name": "hash-alg",
--          "type": "739"
-+          "type": "740"
-         },
-         {
-           "name": "detached-header",
-@@ -23627,24 +23662,24 @@
-         },
-         {
-           "name": "slots",
--          "type": "[798]"
-+          "type": "[799]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "783",
-+      "name": "784",
-       "members": [
-         {
-           "name": "encryption-format",
-           "default": null,
--          "type": "729"
-+          "type": "730"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "784",
-+      "name": "785",
-       "members": [
-         {
-           "name": "extent-size-hint",
-@@ -23655,7 +23690,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "785",
-+      "name": "786",
-       "members": [
-         {
-           "name": "md5"
-@@ -23675,7 +23710,7 @@
-       ]
-     },
-     {
--      "name": "786",
-+      "name": "787",
-       "members": [
-         {
-           "name": "qcow"
-@@ -23691,7 +23726,7 @@
-       ]
-     },
-     {
--      "name": "787",
-+      "name": "788",
-       "members": [
-         {
-           "name": "key-secret",
-@@ -23701,27 +23736,27 @@
-         {
-           "name": "cipher-alg",
-           "default": null,
--          "type": "736"
-+          "type": "737"
-         },
-         {
-           "name": "cipher-mode",
-           "default": null,
--          "type": "737"
-+          "type": "738"
-         },
-         {
-           "name": "ivgen-alg",
-           "default": null,
--          "type": "738"
-+          "type": "739"
-         },
-         {
-           "name": "ivgen-hash-alg",
-           "default": null,
--          "type": "739"
-+          "type": "740"
-         },
-         {
-           "name": "hash-alg",
-           "default": null,
--          "type": "739"
-+          "type": "740"
-         },
-         {
-           "name": "iter-time",
-@@ -23732,7 +23767,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "788",
-+      "name": "789",
-       "members": [
-         {
-           "name": "key-secret",
-@@ -23741,13 +23776,13 @@
-         {
-           "name": "cipher-alg",
-           "default": null,
--          "type": "736"
-+          "type": "737"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "789",
-+      "name": "790",
-       "members": [
-         {
-           "name": "key-secret",
-@@ -23756,17 +23791,17 @@
-         {
-           "name": "cipher-alg",
-           "default": null,
--          "type": "736"
-+          "type": "737"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "790",
-+      "name": "791",
-       "members": [
-         {
-           "name": "state",
--          "type": "748"
-+          "type": "749"
-         },
-         {
-           "name": "new-secret",
-@@ -23797,7 +23832,7 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "791",
-+      "name": "792",
-       "members": [
-         {
-           "name": "left"
-@@ -23845,7 +23880,7 @@
-       ]
-     },
-     {
--      "name": "792",
-+      "name": "793",
-       "members": [
-         {
-           "name": "x"
-@@ -23861,7 +23896,7 @@
-       ]
-     },
-     {
--      "name": "793",
-+      "name": "794",
-       "members": [
-         {
-           "name": "begin"
-@@ -23889,7 +23924,7 @@
-       ]
-     },
-     {
--      "name": "794",
-+      "name": "795",
-       "members": [
-         {
-           "name": "base",
-@@ -23903,12 +23938,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "795",
-+      "name": "796",
-       "tag": "format",
-       "variants": [
-         {
-           "case": "luks",
--          "type": "782"
-+          "type": "783"
-         },
-         {
-           "case": "aes",
-@@ -23918,18 +23953,18 @@
-       "members": [
-         {
-           "name": "format",
--          "type": "725"
-+          "type": "726"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[796]",
--      "element-type": "796",
-+      "name": "[797]",
-+      "element-type": "797",
-       "meta-type": "array"
-     },
-     {
--      "name": "796",
-+      "name": "797",
-       "members": [
-         {
-           "name": "name",
-@@ -23941,18 +23976,18 @@
-         },
-         {
-           "name": "flags",
--          "type": "[799]"
-+          "type": "[800]"
-         }
-       ],
-       "meta-type": "object"
-     },
-     {
--      "name": "[797]",
--      "element-type": "797",
-+      "name": "[798]",
-+      "element-type": "798",
-       "meta-type": "array"
-     },
-     {
--      "name": "797",
-+      "name": "798",
-       "members": [
-         {
-           "name": "filename",
-@@ -23980,12 +24015,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[798]",
--      "element-type": "798",
-+      "name": "[799]",
-+      "element-type": "799",
-       "meta-type": "array"
-     },
-     {
--      "name": "798",
-+      "name": "799",
-       "members": [
-         {
-           "name": "active",
-@@ -24009,12 +24044,12 @@
-       "meta-type": "object"
-     },
-     {
--      "name": "[799]",
--      "element-type": "799",
-+      "name": "[800]",
-+      "element-type": "800",
-       "meta-type": "array"
-     },
-     {
--      "name": "799",
-+      "name": "800",
-       "members": [
-         {
-           "name": "in-use"
-@@ -39314,6 +39349,11 @@
-           "help": "Node can become read-only if opening read-write fails",
-           "type": "boolean"
-         },
-+        {
-+          "name": "active",
-+          "help": "Node is activated",
-+          "type": "boolean"
-+        },
-         {
-           "name": "cache.no-flush",
-           "help": "Ignore flush requests",
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-index 40ad7e797a..aed0a58fa7 100644
---- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
-@@ -212,7 +212,7 @@
-   <flag name='netdev-stream-reconnect-miliseconds'/>
-   <version>9002050</version>
-   <microcodeVersion>43100285</microcodeVersion>
--  <package>v9.2.0-1537-gd922088eb4</package>
-+  <package>v9.2.0-1636-gffaf7f0376</package>
-   <arch>x86_64</arch>
-   <hostCPU type='kvm' model='base' migratability='yes'>
-     <property name='avx-ne-convert' type='boolean' value='false'/>
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuxmlconftest-Add-testing-of-FDs-with-writable-flag-in-disk-source-fd.patch b/SOURCES/libvirt-qemuxmlconftest-Add-testing-of-FDs-with-writable-flag-in-disk-source-fd.patch
deleted file mode 100644
index 45a868a..0000000
--- a/SOURCES/libvirt-qemuxmlconftest-Add-testing-of-FDs-with-writable-flag-in-disk-source-fd.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 12e160e847dac7ef71a0eb09f862b544cb49f76f Mon Sep 17 00:00:00 2001
-Message-ID: <12e160e847dac7ef71a0eb09f862b544cb49f76f.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 6 Feb 2025 15:55:37 +0100
-Subject: [PATCH] qemuxmlconftest: Add testing of FDs with 'writable' flag in
- 'disk-source-fd'
-
-Add few examples of fd groups with the 'writable' flag set, when passing
-a single FD. Notably as a top level image of a readonly disk (even when
-that doesn't make much sense) and also as a base image of a chain.
-
-Note that this documents a status quo of a bug fixed in upcoming patch.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 7a119483a361a3ab814e4e07ccac7b13b0cbfbf7)
-
-https://issues.redhat.com/browse/RHEL-37519
----
- .../disk-source-fd.x86_64-latest.args         | 36 +++++++++++--------
- .../disk-source-fd.x86_64-latest.xml          | 21 +++++++++--
- tests/qemuxmlconfdata/disk-source-fd.xml      | 16 +++++++--
- tests/qemuxmlconftest.c                       |  3 ++
- 4 files changed, 57 insertions(+), 19 deletions(-)
-
-diff --git a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
-index 1341b7d032..d77b3ca505 100644
---- a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
-@@ -27,21 +27,27 @@ 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"}' \
---add-fd set=2,fd=200,opaque=libvirt-4-storage0 \
---add-fd set=2,fd=205,opaque=libvirt-4-storage1 \
---blockdev '{"driver":"file","filename":"/dev/fdset/2","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
---blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qcow2","file":"libvirt-4-storage"}' \
---device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-4-format","id":"virtio-disk4","bootindex":1}' \
---blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.1484071876","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
---blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"qcow2","file":"libvirt-3-storage","backing":null}' \
---add-fd set=1,fd=247,opaque=libvirt-2-storage0 \
---add-fd set=1,fd=248,opaque=libvirt-2-storage1 \
---blockdev '{"driver":"file","filename":"/dev/fdset/1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
---blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow2","file":"libvirt-2-storage","backing":"libvirt-3-format"}' \
---add-fd set=0,fd=204,opaque=libvirt-1-storage0 \
---blockdev '{"driver":"file","filename":"/dev/fdset/0","node-name":"libvirt-1-storage","read-only":false,"discard":"unmap"}' \
---blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage","backing":"libvirt-2-format"}' \
---device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-1-format","id":"virtio-disk5"}' \
-+-add-fd set=5,fd=200,opaque=libvirt-6-storage0 \
-+-add-fd set=5,fd=205,opaque=libvirt-6-storage1 \
-+-blockdev '{"driver":"file","filename":"/dev/fdset/5","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \
-+-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qcow2","file":"libvirt-6-storage"}' \
-+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-6-format","id":"virtio-disk4","bootindex":1}' \
-+-add-fd set=4,fd=209,opaque=libvirt-5-storage0 \
-+-blockdev '{"driver":"file","filename":"/dev/fdset/4","node-name":"libvirt-5-storage","read-only":true}' \
-+-add-fd set=3,fd=247,opaque=libvirt-4-storage0 \
-+-add-fd set=3,fd=248,opaque=libvirt-4-storage1 \
-+-blockdev '{"driver":"file","filename":"/dev/fdset/3","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
-+-blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"qcow2","file":"libvirt-4-storage","backing":"libvirt-5-storage"}' \
-+-add-fd set=2,fd=204,opaque=libvirt-3-storage0 \
-+-blockdev '{"driver":"file","filename":"/dev/fdset/2","node-name":"libvirt-3-storage","read-only":false,"discard":"unmap"}' \
-+-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qcow2","file":"libvirt-3-storage","backing":"libvirt-4-format"}' \
-+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-3-format","id":"virtio-disk5"}' \
-+-add-fd set=1,fd=207,opaque=libvirt-2-storage0 \
-+-blockdev '{"driver":"file","filename":"/dev/fdset/1","node-name":"libvirt-2-storage","read-only":true}' \
-+-device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-2-storage","id":"ide0-0-0"}' \
-+-add-fd set=0,fd=208,opaque=libvirt-1-storage0 \
-+-blockdev '{"driver":"file","filename":"/dev/fdset/0","node-name":"libvirt-1-storage","read-only":true}' \
-+-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-1-storage","id":"ide0-0-1"}' \
- -audiodev '{"id":"audio1","driver":"none"}' \
- -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \
- -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-diff --git a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.xml
-index 9ab5e9443f..d9917c7d53 100644
---- a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.xml
-+++ b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.xml
-@@ -30,18 +30,35 @@
-         <format type='qcow2'/>
-         <source file='/var/lib/libvirt/images/rhel7.1484071877' fdgroup='testgroup6'/>
-         <backingStore type='file'>
--          <format type='qcow2'/>
--          <source file='/var/lib/libvirt/images/rhel7.1484071876'/>
-+          <format type='raw'/>
-+          <source file='/var/lib/libvirt/images/rhel7.1484071876' fdgroup='raw-rw-base'/>
-           <backingStore/>
-         </backingStore>
-       </backingStore>
-       <target dev='vdf' bus='virtio'/>
-       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-     </disk>
-+    <disk type='file' device='cdrom'>
-+      <driver name='qemu' type='raw'/>
-+      <source file='/path/to/cdimage-ro' fdgroup='cdimage-ro'/>
-+      <target dev='hda' bus='ide'/>
-+      <readonly/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <disk type='file' device='cdrom'>
-+      <driver name='qemu' type='raw'/>
-+      <source file='/path/to/cdimage-rw' fdgroup='cdimage-rw'/>
-+      <target dev='hdb' bus='ide'/>
-+      <readonly/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
-+    </disk>
-     <controller type='usb' index='0' model='piix3-uhci'>
-       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-     </controller>
-     <controller type='pci' index='0' model='pci-root'/>
-+    <controller type='ide' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-+    </controller>
-     <input type='mouse' bus='ps2'/>
-     <input type='keyboard' bus='ps2'/>
-     <audio id='1' type='none'/>
-diff --git a/tests/qemuxmlconfdata/disk-source-fd.xml b/tests/qemuxmlconfdata/disk-source-fd.xml
-index d8c47fa364..93a3fcfbf7 100644
---- a/tests/qemuxmlconfdata/disk-source-fd.xml
-+++ b/tests/qemuxmlconfdata/disk-source-fd.xml
-@@ -19,6 +19,18 @@
-       <source file='/path/to/blah' fdgroup='testgroup2'/>
-       <target dev='vde' bus='virtio'/>
-     </disk>
-+    <disk type='file' device='cdrom'>
-+      <driver name='qemu' type='raw'/>
-+      <source file='/path/to/cdimage-ro' fdgroup='cdimage-ro'/>
-+      <readonly/>
-+      <target dev='hda' bus='ide'/>
-+    </disk>
-+    <disk type='file' device='cdrom'>
-+      <driver name='qemu' type='raw'/>
-+      <source file='/path/to/cdimage-rw' fdgroup='cdimage-rw'/>
-+      <readonly/>
-+      <target dev='hdb' bus='ide'/>
-+    </disk>
-     <disk type='file' device='disk'>
-       <driver name='qemu' type='qcow2'/>
-       <source file='/var/lib/libvirt/images/rhel7.1484071880' fdgroup='testgroup5'/>
-@@ -26,8 +38,8 @@
-         <format type='qcow2'/>
-         <source file='/var/lib/libvirt/images/rhel7.1484071877' fdgroup='testgroup6'/>
-         <backingStore type='file'>
--          <format type='qcow2'/>
--          <source file='/var/lib/libvirt/images/rhel7.1484071876'/>
-+          <format type='raw'/>
-+          <source file='/var/lib/libvirt/images/rhel7.1484071876' fdgroup='raw-rw-base'/>
-           <backingStore/>
-         </backingStore>
-       </backingStore>
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index 7da622e9be..821d9b1048 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -1655,6 +1655,9 @@ mymain(void)
-     DO_TEST_CAPS_ARCH_LATEST_FULL("disk-source-fd", "x86_64",
-                                   ARG_FD_GROUP, "testgroup2", false, 2, 200, 205,
-                                   ARG_FD_GROUP, "testgroup5", false, 1, 204,
-+                                  ARG_FD_GROUP, "cdimage-ro", false, 1, 207,
-+                                  ARG_FD_GROUP, "cdimage-rw", true, 1, 208,
-+                                  ARG_FD_GROUP, "raw-rw-base", true, 1, 209,
-                                   ARG_FD_GROUP, "testgroup6", false, 2, 247, 248);
- 
-     DO_TEST_CAPS_LATEST("disk-slices");
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuxmlconftest-Allow-testing-of-the-writable-flag-for-passed-FDs-for-disks.patch b/SOURCES/libvirt-qemuxmlconftest-Allow-testing-of-the-writable-flag-for-passed-FDs-for-disks.patch
deleted file mode 100644
index 72b899b..0000000
--- a/SOURCES/libvirt-qemuxmlconftest-Allow-testing-of-the-writable-flag-for-passed-FDs-for-disks.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 81ccb43343bfd63358b610ef5a44082e2c5081f4 Mon Sep 17 00:00:00 2001
-Message-ID: <81ccb43343bfd63358b610ef5a44082e2c5081f4.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 6 Feb 2025 15:50:35 +0100
-Subject: [PATCH] qemuxmlconftest: Allow testing of the 'writable' flag for
- passed FDs for disks
-
-Pass also the 'writable' state to the fake passed FDs so that we can
-test it.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 500d985a130ff7910ca6cdeac42046d7301da43f)
-
-https://issues.redhat.com/browse/RHEL-37519
----
- tests/qemuxmlconftest.c | 6 +++---
- tests/testutilsqemu.c   | 2 ++
- tests/testutilsqemu.h   | 2 +-
- 3 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index 53a0237a42..7da622e9be 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -1653,9 +1653,9 @@ mymain(void)
-     DO_TEST_CAPS_LATEST("disk-backing-chains-noindex");
-     DO_TEST_CAPS_LATEST("disk-qcow2-datafile-store");
-     DO_TEST_CAPS_ARCH_LATEST_FULL("disk-source-fd", "x86_64",
--                                  ARG_FD_GROUP, "testgroup2", 2, 200, 205,
--                                  ARG_FD_GROUP, "testgroup5", 1, 204,
--                                  ARG_FD_GROUP, "testgroup6", 2, 247, 248);
-+                                  ARG_FD_GROUP, "testgroup2", false, 2, 200, 205,
-+                                  ARG_FD_GROUP, "testgroup5", false, 1, 204,
-+                                  ARG_FD_GROUP, "testgroup6", false, 2, 247, 248);
- 
-     DO_TEST_CAPS_LATEST("disk-slices");
-     DO_TEST_CAPS_LATEST("disk-rotation");
-diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
-index 5caccbc6b4..d395a1e61b 100644
---- a/tests/testutilsqemu.c
-+++ b/tests/testutilsqemu.c
-@@ -705,11 +705,13 @@ testQemuInfoSetArgs(testQemuInfo *info,
-             virStorageSourceFDTuple *new = virStorageSourceFDTupleNew();
-             const char *fdname = va_arg(argptr, char *);
-             VIR_AUTOCLOSE fakefd = open("/dev/zero", O_RDWR);
-+            bool writable = va_arg(argptr, int);
-             size_t i;
- 
-             new->nfds = va_arg(argptr, unsigned int);
-             new->fds = g_new0(int, new->nfds);
-             new->testfds = g_new0(int, new->nfds);
-+            new->writable = writable;
- 
-             for (i = 0; i < new->nfds; i++) {
-                 new->testfds[i] = va_arg(argptr, unsigned int);
-diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
-index 74e307d653..20135b8390 100644
---- a/tests/testutilsqemu.h
-+++ b/tests/testutilsqemu.h
-@@ -49,7 +49,7 @@ typedef enum {
-     ARG_CAPS_VER,
-     ARG_CAPS_VARIANT,
-     ARG_CAPS_HOST_CPU_MODEL,
--    ARG_FD_GROUP, /* name, nfds, fd[0], ... fd[n-1] */
-+    ARG_FD_GROUP, /* name, writable, nfds, fd[0], ... fd[n-1] */
-     ARG_VDPA_FD, /* vdpadev, fd */
-     ARG_NBDKIT_CAPS,
-     ARG_END,
--- 
-2.48.1
diff --git a/SOURCES/libvirt-qemuxmlconftest-Drop-s390-default-cpu-.ccw-virtio-2.7-test-cases.patch b/SOURCES/libvirt-qemuxmlconftest-Drop-s390-default-cpu-.ccw-virtio-2.7-test-cases.patch
deleted file mode 100644
index 3d476f3..0000000
--- a/SOURCES/libvirt-qemuxmlconftest-Drop-s390-default-cpu-.ccw-virtio-2.7-test-cases.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From 09dc3f583b342ef35b1ead29ff5d09d76140590c Mon Sep 17 00:00:00 2001
-Message-ID: <09dc3f583b342ef35b1ead29ff5d09d76140590c.1744876588.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 14 Jan 2025 12:16:06 +0100
-Subject: [PATCH] qemuxmlconftest: Drop s390-default-cpu-...ccw-virtio-2.7 test
- cases
-
-In its upstream commit [1], qemu dropped s390-2.7 machine type,
-then in commit [2] the s390-2.8 machine type was dropped. But as
-Thomas Huth pointed out, any machine type that's older than 6
-years is subject to removal [3]. This means, any machine type
-older than 4.1 is going to be removed eventually.
-
-We have two test cases that assumes existence of 2.7 machine type.
-While they could be switched to 4.1 machine type, we also have
-another test case that already check 4.2 machine type.
-Therefore, just drop the 2.7 ones.
-
-1: https://gitlab.com/qemu-project/qemu/-/commit/3199c7ee76089fb6844f6b2bed1f5d3d99a7527c
-2: https://gitlab.com/qemu-project/qemu/-/commit/66924fe36977d9d9e45ba3e0b6e851ee170507f6
-3: https://gitlab.com/qemu-project/qemu/-/commit/ce80c4fa6ff0f5c379bba7db74d04593e9fb12f2
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit 4933dfcce02baa941da6dd9e5b111d36d63ef900)
-Resolves: https://issues.redhat.com/browse/RHEL-72976
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 32 -------------------
- ...lt-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml | 25 ---------------
- .../s390-default-cpu-kvm-ccw-virtio-2.7.xml   | 16 ----------
- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 32 -------------------
- ...lt-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml | 27 ----------------
- .../s390-default-cpu-tcg-ccw-virtio-2.7.xml   | 16 ----------
- tests/qemuxmlconftest.c                       |  2 --
- 7 files changed, 150 deletions(-)
- delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args
- delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml
- delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml
- delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args
- delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml
- delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml
-
-diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args
-deleted file mode 100644
-index 0d44697425..0000000000
---- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args
-+++ /dev/null
-@@ -1,32 +0,0 @@
--LC_ALL=C \
--PATH=/bin \
--HOME=/var/lib/libvirt/qemu/domain--1-test \
--USER=test \
--LOGNAME=test \
--XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \
--XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \
--XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
--/usr/bin/qemu-system-s390x \
---name guest=test,debug-threads=on \
---S \
---object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
---machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off,memory-backend=s390.ram \
---accel kvm \
---cpu host \
---m size=262144k \
---object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \
---overcommit mem-lock=off \
---smp 1,sockets=1,cores=1,threads=1 \
---uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \
---display none \
---no-user-config \
---nodefaults \
---chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
---mon chardev=charmonitor,id=monitor,mode=control \
---rtc base=utc \
---no-shutdown \
---boot strict=on \
---audiodev '{"id":"audio1","driver":"none"}' \
---device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000"}' \
---sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
---msg timestamp=on
-diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml
-deleted file mode 100644
-index ae39e6277d..0000000000
---- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml
-+++ /dev/null
-@@ -1,25 +0,0 @@
--<domain type='kvm'>
--  <name>test</name>
--  <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid>
--  <memory unit='KiB'>262144</memory>
--  <currentMemory unit='KiB'>262144</currentMemory>
--  <vcpu placement='static'>1</vcpu>
--  <os>
--    <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type>
--    <boot dev='hd'/>
--  </os>
--  <cpu mode='host-passthrough' check='none'/>
--  <clock offset='utc'/>
--  <on_poweroff>destroy</on_poweroff>
--  <on_reboot>restart</on_reboot>
--  <on_crash>destroy</on_crash>
--  <devices>
--    <emulator>/usr/bin/qemu-system-s390x</emulator>
--    <controller type='pci' index='0' model='pci-root'/>
--    <audio id='1' type='none'/>
--    <memballoon model='virtio'>
--      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
--    </memballoon>
--    <panic model='s390'/>
--  </devices>
--</domain>
-diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml
-deleted file mode 100644
-index a3c1804f57..0000000000
---- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<domain type='kvm'>
--  <name>test</name>
--  <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid>
--  <memory>262144</memory>
--  <currentMemory>262144</currentMemory>
--  <os>
--    <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type>
--  </os>
--  <clock offset='utc'/>
--  <on_poweroff>destroy</on_poweroff>
--  <on_reboot>restart</on_reboot>
--  <on_crash>destroy</on_crash>
--  <devices>
--    <emulator>/usr/bin/qemu-system-s390x</emulator>
--  </devices>
--</domain>
-diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args
-deleted file mode 100644
-index 06b3f5733e..0000000000
---- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args
-+++ /dev/null
-@@ -1,32 +0,0 @@
--LC_ALL=C \
--PATH=/bin \
--HOME=/var/lib/libvirt/qemu/domain--1-test \
--USER=test \
--LOGNAME=test \
--XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \
--XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \
--XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
--/usr/bin/qemu-system-s390x \
---name guest=test,debug-threads=on \
---S \
---object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
---machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off,memory-backend=s390.ram \
---accel tcg \
---cpu qemu \
---m size=262144k \
---object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \
---overcommit mem-lock=off \
---smp 1,sockets=1,cores=1,threads=1 \
---uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \
---display none \
---no-user-config \
---nodefaults \
---chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
---mon chardev=charmonitor,id=monitor,mode=control \
---rtc base=utc \
---no-shutdown \
---boot strict=on \
---audiodev '{"id":"audio1","driver":"none"}' \
---device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000"}' \
---sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
---msg timestamp=on
-diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml
-deleted file mode 100644
-index f4f9e724a9..0000000000
---- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml
-+++ /dev/null
-@@ -1,27 +0,0 @@
--<domain type='qemu'>
--  <name>test</name>
--  <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid>
--  <memory unit='KiB'>262144</memory>
--  <currentMemory unit='KiB'>262144</currentMemory>
--  <vcpu placement='static'>1</vcpu>
--  <os>
--    <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type>
--    <boot dev='hd'/>
--  </os>
--  <cpu mode='custom' match='exact' check='none'>
--    <model fallback='forbid'>qemu</model>
--  </cpu>
--  <clock offset='utc'/>
--  <on_poweroff>destroy</on_poweroff>
--  <on_reboot>restart</on_reboot>
--  <on_crash>destroy</on_crash>
--  <devices>
--    <emulator>/usr/bin/qemu-system-s390x</emulator>
--    <controller type='pci' index='0' model='pci-root'/>
--    <audio id='1' type='none'/>
--    <memballoon model='virtio'>
--      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
--    </memballoon>
--    <panic model='s390'/>
--  </devices>
--</domain>
-diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml
-deleted file mode 100644
-index 3451e9d81f..0000000000
---- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml
-+++ /dev/null
-@@ -1,16 +0,0 @@
--<domain type='qemu'>
--  <name>test</name>
--  <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid>
--  <memory>262144</memory>
--  <currentMemory>262144</currentMemory>
--  <os>
--    <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type>
--  </os>
--  <clock offset='utc'/>
--  <on_poweroff>destroy</on_poweroff>
--  <on_reboot>restart</on_reboot>
--  <on_crash>destroy</on_crash>
--  <devices>
--    <emulator>/usr/bin/qemu-system-s390x</emulator>
--  </devices>
--</domain>
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index 2007944c29..00a7677ea7 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -2925,8 +2925,6 @@ mymain(void)
-     DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-tcg-pseries-3.1", "ppc64");
-     DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-kvm-pseries-4.2", "ppc64");
-     DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-tcg-pseries-4.2", "ppc64");
--    DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-2.7", "s390x");
--    DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-2.7", "s390x");
-     DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-4.2", "s390x");
-     DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-4.2", "s390x");
-     DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-pc-4.2", "x86_64");
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemuxmlconftest-Include-shared-memory-net-vhostuser-test-cases.patch b/SOURCES/libvirt-qemuxmlconftest-Include-shared-memory-net-vhostuser-test-cases.patch
deleted file mode 100644
index 3f5770e..0000000
--- a/SOURCES/libvirt-qemuxmlconftest-Include-shared-memory-net-vhostuser-test-cases.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From c8df999c2129645b26c043a81b051b330c05ba46 Mon Sep 17 00:00:00 2001
-Message-ID: <c8df999c2129645b26c043a81b051b330c05ba46.1742990721.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 11 Mar 2025 09:01:03 +0100
-Subject: [PATCH] qemuxmlconftest: Include shared memory 'net-vhostuser' test
- cases
-
-The vhost-user protocol requires shared memory support to work properly.
-
-Our test XMLs didn't have it configured as for interface the check if
-shared memory is present only produces a warning instead of a proper
-error.
-
-Upcoming patches will be moving the check to become fatal so the test
-cases need to be fixed first.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 779a975355dcb34898abaefdf8968c214a66ebf1)
-
-https://issues.redhat.com/browse/RHEL-84133
----
- tests/qemuxmlconfdata/net-vhostuser-fail.x86_64-latest.xml    | 3 +++
- tests/qemuxmlconfdata/net-vhostuser-fail.xml                  | 3 +++
- tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args | 2 +-
- tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.xml  | 3 +++
- tests/qemuxmlconfdata/net-vhostuser-multiq.xml                | 3 +++
- tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args        | 2 +-
- tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.xml         | 3 +++
- tests/qemuxmlconfdata/net-vhostuser.xml                       | 3 +++
- 8 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-fail.x86_64-latest.xml b/tests/qemuxmlconfdata/net-vhostuser-fail.x86_64-latest.xml
-index 60e591001d..ce1ebf9462 100644
---- a/tests/qemuxmlconfdata/net-vhostuser-fail.x86_64-latest.xml
-+++ b/tests/qemuxmlconfdata/net-vhostuser-fail.x86_64-latest.xml
-@@ -3,6 +3,9 @@
-   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-   <memory unit='KiB'>219136</memory>
-   <currentMemory unit='KiB'>219136</currentMemory>
-+  <memoryBacking>
-+    <access mode='shared'/>
-+  </memoryBacking>
-   <vcpu placement='static'>1</vcpu>
-   <os>
-     <type arch='x86_64' machine='pc'>hvm</type>
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-fail.xml b/tests/qemuxmlconfdata/net-vhostuser-fail.xml
-index d50589af6f..b6b0b977d5 100644
---- a/tests/qemuxmlconfdata/net-vhostuser-fail.xml
-+++ b/tests/qemuxmlconfdata/net-vhostuser-fail.xml
-@@ -3,6 +3,9 @@
-   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-   <memory unit='KiB'>219136</memory>
-   <currentMemory unit='KiB'>219136</currentMemory>
-+  <memoryBacking>
-+    <access mode='shared'/>
-+  </memoryBacking>
-   <vcpu placement='static'>1</vcpu>
-   <os>
-     <type arch='x86_64' machine='pc'>hvm</type>
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args
-index 922758a034..4ea3d4eebd 100644
---- a/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args
-@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
- -accel tcg \
- -cpu qemu64 \
- -m size=219136k \
---object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-+-object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/pc.ram","share":true,"x-use-canonical-path-for-ramblock-id":false,"size":224395264}' \
- -overcommit mem-lock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.xml b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.xml
-index 5c2cf70a4b..93524c2864 100644
---- a/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.xml
-+++ b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.xml
-@@ -3,6 +3,9 @@
-   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-   <memory unit='KiB'>219136</memory>
-   <currentMemory unit='KiB'>219136</currentMemory>
-+  <memoryBacking>
-+    <access mode='shared'/>
-+  </memoryBacking>
-   <vcpu placement='static'>1</vcpu>
-   <os>
-     <type arch='x86_64' machine='pc'>hvm</type>
-diff --git a/tests/qemuxmlconfdata/net-vhostuser-multiq.xml b/tests/qemuxmlconfdata/net-vhostuser-multiq.xml
-index ed492ea41a..fa324c9d17 100644
---- a/tests/qemuxmlconfdata/net-vhostuser-multiq.xml
-+++ b/tests/qemuxmlconfdata/net-vhostuser-multiq.xml
-@@ -3,6 +3,9 @@
-   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-   <memory unit='KiB'>219136</memory>
-   <currentMemory unit='KiB'>219136</currentMemory>
-+  <memoryBacking>
-+    <access mode='shared'/>
-+  </memoryBacking>
-   <vcpu placement='static'>1</vcpu>
-   <os>
-     <type arch='x86_64' machine='pc'>hvm</type>
-diff --git a/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args
-index bc1de8c8ed..f5925c77fe 100644
---- a/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args
-+++ b/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args
-@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
- -accel tcg \
- -cpu qemu64 \
- -m size=219136k \
---object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-+-object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/pc.ram","share":true,"x-use-canonical-path-for-ramblock-id":false,"size":224395264}' \
- -overcommit mem-lock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-diff --git a/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.xml b/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.xml
-index c77d46147e..44bebef2c8 100644
---- a/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.xml
-+++ b/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.xml
-@@ -3,6 +3,9 @@
-   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-   <memory unit='KiB'>219136</memory>
-   <currentMemory unit='KiB'>219136</currentMemory>
-+  <memoryBacking>
-+    <access mode='shared'/>
-+  </memoryBacking>
-   <vcpu placement='static'>1</vcpu>
-   <os>
-     <type arch='x86_64' machine='pc'>hvm</type>
-diff --git a/tests/qemuxmlconfdata/net-vhostuser.xml b/tests/qemuxmlconfdata/net-vhostuser.xml
-index e55a30a54f..91d1abc027 100644
---- a/tests/qemuxmlconfdata/net-vhostuser.xml
-+++ b/tests/qemuxmlconfdata/net-vhostuser.xml
-@@ -3,6 +3,9 @@
-   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-   <memory unit='KiB'>219136</memory>
-   <currentMemory unit='KiB'>219136</currentMemory>
-+  <memoryBacking>
-+    <access mode='shared'/>
-+  </memoryBacking>
-   <vcpu placement='static'>1</vcpu>
-   <os>
-     <type arch='x86_64' machine='pc'>hvm</type>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemuxmlconftest-Introduce-memory-hotplug-virtio-mem-ccw-s390x.xml.patch b/SOURCES/libvirt-qemuxmlconftest-Introduce-memory-hotplug-virtio-mem-ccw-s390x.xml.patch
deleted file mode 100644
index 99d0fe5..0000000
--- a/SOURCES/libvirt-qemuxmlconftest-Introduce-memory-hotplug-virtio-mem-ccw-s390x.xml.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From e0b10b2446247933187b1ecb718e6405e08c7e57 Mon Sep 17 00:00:00 2001
-Message-ID: <e0b10b2446247933187b1ecb718e6405e08c7e57.1744876588.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 28 Jan 2025 08:54:36 +0100
-Subject: [PATCH] qemuxmlconftest: Introduce
- memory-hotplug-virtio-mem-ccw-s390x.xml
-
-This is similar to emuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.xml
-except the explicit placement of virtio-mem onto a PCI bus is removed.
-This results in virtio-mem being placed onto CCW "bus" this demonstrating
-previous commits working as expected.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit f23f8ff91a35ac6939f75f1cae1c5ced9ba4a02c)
-Resolves: https://issues.redhat.com/browse/RHEL-72976
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- ...lug-virtio-mem-ccw-s390x.s390x-latest.args | 39 ++++++++++++
- ...plug-virtio-mem-ccw-s390x.s390x-latest.xml | 60 +++++++++++++++++++
- .../memory-hotplug-virtio-mem-ccw-s390x.xml   | 57 ++++++++++++++++++
- tests/qemuxmlconftest.c                       |  1 +
- 4 files changed, 157 insertions(+)
- create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.args
- create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.xml
- create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.xml
-
-diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.args
-new file mode 100644
-index 0000000000..a6bbef5ce7
---- /dev/null
-+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.args
-@@ -0,0 +1,39 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-+USER=test \
-+LOGNAME=test \
-+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-+/usr/bin/qemu-system-s390x \
-+-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 s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel kvm \
-+-cpu gen16a-base \
-+-m size=2095104k,maxmem=1099511627776k \
-+-overcommit mem-lock=off \
-+-smp 2,sockets=2,cores=1,threads=1 \
-+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \
-+-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot strict=on \
-+-object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \
-+-device '{"driver":"virtio-mem-ccw","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","devno":"fe.0.0002"}' \
-+-object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \
-+-device '{"driver":"virtio-mem-ccw","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"memaddr":5637144576,"dynamic-memslots":true,"id":"virtiomem1","devno":"fe.0.0003"}' \
-+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \
-+-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \
-+-audiodev '{"id":"audio1","driver":"none"}' \
-+-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.xml
-new file mode 100644
-index 0000000000..fe18b1ec7b
---- /dev/null
-+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.xml
-@@ -0,0 +1,60 @@
-+<domain type='kvm'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <maxMemory unit='KiB'>1099511627776</maxMemory>
-+  <memory unit='KiB'>8388608</memory>
-+  <currentMemory unit='KiB'>8388608</currentMemory>
-+  <vcpu placement='static' cpuset='0-1'>2</vcpu>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='forbid'>gen16a-base</model>
-+    <numa>
-+      <cell id='0' cpus='0-1' memory='2095104' unit='KiB'/>
-+    </numa>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='virtio'/>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
-+    </disk>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <audio id='1' type='none'/>
-+    <memballoon model='virtio'>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
-+    </memballoon>
-+    <panic model='s390'/>
-+    <memory model='virtio-mem'>
-+      <target>
-+        <size unit='KiB'>1048576</size>
-+        <node>0</node>
-+        <block unit='KiB'>2048</block>
-+        <requested unit='KiB'>524288</requested>
-+      </target>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
-+    </memory>
-+    <memory model='virtio-mem'>
-+      <source>
-+        <nodemask>1-3</nodemask>
-+        <pagesize unit='KiB'>2048</pagesize>
-+      </source>
-+      <target dynamicMemslots='yes'>
-+        <size unit='KiB'>2097152</size>
-+        <node>0</node>
-+        <block unit='KiB'>2048</block>
-+        <requested unit='KiB'>1048576</requested>
-+        <address base='0x150000000'/>
-+      </target>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/>
-+    </memory>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.xml
-new file mode 100644
-index 0000000000..4f9f90d1e2
---- /dev/null
-+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.xml
-@@ -0,0 +1,57 @@
-+<domain type='kvm'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <maxMemory unit='KiB'>1099511627776</maxMemory>
-+  <memory unit='KiB'>8388608</memory>
-+  <currentMemory unit='KiB'>8388608</currentMemory>
-+  <vcpu placement='static' cpuset='0-1'>2</vcpu>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='forbid'>gen16a-base</model>
-+    <numa>
-+      <cell id='0' cpus='0-1' memory='2095104' unit='KiB'/>
-+    </numa>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='virtio'/>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
-+    </disk>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <audio id='1' type='none'/>
-+    <memballoon model='virtio'>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
-+    </memballoon>
-+    <memory model='virtio-mem'>
-+      <target>
-+        <size unit='KiB'>1048576</size>
-+        <node>0</node>
-+        <block unit='KiB'>2048</block>
-+        <requested unit='KiB'>524288</requested>
-+      </target>
-+    </memory>
-+    <memory model='virtio-mem'>
-+      <source>
-+        <nodemask>1-3</nodemask>
-+        <pagesize unit='KiB'>2048</pagesize>
-+      </source>
-+      <target dynamicMemslots='yes'>
-+        <size unit='KiB'>2097152</size>
-+        <node>0</node>
-+        <block unit='KiB'>2048</block>
-+        <requested unit='KiB'>1048576</requested>
-+        <address base='0x150000000'/>
-+      </target>
-+    </memory>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index 14f159b833..e88aa6da92 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -2716,6 +2716,7 @@ mymain(void)
-      * than other memory devices because of how they handle <labelsize/> */
-     DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-overlap");
-     DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-virtio-mem-pci-s390x", "s390x");
-+    DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-virtio-mem-ccw-s390x", "s390x");
- 
-     DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-on-caps", "s390x");
-     DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-on-cap", "s390x");
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemuxmlconftest-Introduce-memory-hotplug-virtio-mem-pci-s390x.xml.patch b/SOURCES/libvirt-qemuxmlconftest-Introduce-memory-hotplug-virtio-mem-pci-s390x.xml.patch
deleted file mode 100644
index a093c9c..0000000
--- a/SOURCES/libvirt-qemuxmlconftest-Introduce-memory-hotplug-virtio-mem-pci-s390x.xml.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From 800b0cb9c899ff14ddfb1b8528048a780a4a5949 Mon Sep 17 00:00:00 2001
-Message-ID: <800b0cb9c899ff14ddfb1b8528048a780a4a5949.1744876588.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 15 Jan 2025 10:45:31 +0100
-Subject: [PATCH] qemuxmlconftest: Introduce
- memory-hotplug-virtio-mem-pci-s390x.xml
-
-As of v9.2.0-1413-gd77ae821e8 QEMU supports virtio-mem-pci on
-s390 too. Let's add a test case for that.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit 621373d8a850c3882f6b62777f549285a5c0ab97)
-Resolves: https://issues.redhat.com/browse/RHEL-72976
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- ...lug-virtio-mem-pci-s390x.s390x-latest.args | 41 +++++++++++
- ...plug-virtio-mem-pci-s390x.s390x-latest.xml | 71 +++++++++++++++++++
- .../memory-hotplug-virtio-mem-pci-s390x.xml   | 59 +++++++++++++++
- tests/qemuxmlconftest.c                       |  1 +
- 4 files changed, 172 insertions(+)
- create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.args
- create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.xml
- create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.xml
-
-diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.args
-new file mode 100644
-index 0000000000..9704d7d5e9
---- /dev/null
-+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.args
-@@ -0,0 +1,41 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-+USER=test \
-+LOGNAME=test \
-+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-+/usr/bin/qemu-system-s390x \
-+-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 s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel kvm \
-+-cpu gen16a-base \
-+-m size=2095104k,maxmem=1099511627776k \
-+-overcommit mem-lock=off \
-+-smp 2,sockets=2,cores=1,threads=1 \
-+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \
-+-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot strict=on \
-+-device '{"driver":"zpci","uid":1,"fid":0,"target":"pci.1","id":"zpci1"}' \
-+-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x1"}' \
-+-object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \
-+-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0","addr":"0x2"}' \
-+-object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \
-+-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"memaddr":5637144576,"dynamic-memslots":true,"id":"virtiomem1","bus":"pci.1","addr":"0x1"}' \
-+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \
-+-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \
-+-audiodev '{"id":"audio1","driver":"none"}' \
-+-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.xml
-new file mode 100644
-index 0000000000..336c6e5aac
---- /dev/null
-+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.xml
-@@ -0,0 +1,71 @@
-+<domain type='kvm'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <maxMemory unit='KiB'>1099511627776</maxMemory>
-+  <memory unit='KiB'>8388608</memory>
-+  <currentMemory unit='KiB'>8388608</currentMemory>
-+  <vcpu placement='static' cpuset='0-1'>2</vcpu>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='forbid'>gen16a-base</model>
-+    <numa>
-+      <cell id='0' cpus='0-1' memory='2095104' unit='KiB'/>
-+    </numa>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='virtio'/>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
-+    </disk>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <controller type='pci' index='1' model='pci-bridge'>
-+      <model name='pci-bridge'/>
-+      <target chassisNr='1'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'>
-+        <zpci uid='0x0001' fid='0x00000000'/>
-+      </address>
-+    </controller>
-+    <audio id='1' type='none'/>
-+    <memballoon model='virtio'>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
-+    </memballoon>
-+    <panic model='s390'/>
-+    <memory model='virtio-mem'>
-+      <target>
-+        <size unit='KiB'>1048576</size>
-+        <node>0</node>
-+        <block unit='KiB'>2048</block>
-+        <requested unit='KiB'>524288</requested>
-+      </target>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'>
-+        <zpci uid='0x0002' fid='0x00000001'/>
-+      </address>
-+    </memory>
-+    <memory model='virtio-mem'>
-+      <source>
-+        <nodemask>1-3</nodemask>
-+        <pagesize unit='KiB'>2048</pagesize>
-+      </source>
-+      <target dynamicMemslots='yes'>
-+        <size unit='KiB'>2097152</size>
-+        <node>0</node>
-+        <block unit='KiB'>2048</block>
-+        <requested unit='KiB'>1048576</requested>
-+        <address base='0x150000000'/>
-+      </target>
-+      <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'>
-+        <zpci uid='0x0003' fid='0x00000002'/>
-+      </address>
-+    </memory>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.xml
-new file mode 100644
-index 0000000000..747877042a
---- /dev/null
-+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.xml
-@@ -0,0 +1,59 @@
-+<domain type='kvm'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <maxMemory unit='KiB'>1099511627776</maxMemory>
-+  <memory unit='KiB'>8388608</memory>
-+  <currentMemory unit='KiB'>8388608</currentMemory>
-+  <vcpu placement='static' cpuset='0-1'>2</vcpu>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='forbid'>gen16a-base</model>
-+    <numa>
-+      <cell id='0' cpus='0-1' memory='2095104' unit='KiB'/>
-+    </numa>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='virtio'/>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
-+    </disk>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <audio id='1' type='none'/>
-+    <memballoon model='virtio'>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
-+    </memballoon>
-+    <memory model='virtio-mem'>
-+      <target>
-+        <size unit='KiB'>1048576</size>
-+        <node>0</node>
-+        <block unit='KiB'>2048</block>
-+        <requested unit='KiB'>524288</requested>
-+      </target>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-+    </memory>
-+    <memory model='virtio-mem'>
-+      <source>
-+        <nodemask>1-3</nodemask>
-+        <pagesize unit='KiB'>2048</pagesize>
-+      </source>
-+      <target dynamicMemslots='yes'>
-+        <size unit='KiB'>2097152</size>
-+        <node>0</node>
-+        <block unit='KiB'>2048</block>
-+        <requested unit='KiB'>1048576</requested>
-+        <address base='0x150000000'/>
-+      </target>
-+      <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/>
-+    </memory>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
-index 00a7677ea7..14f159b833 100644
---- a/tests/qemuxmlconftest.c
-+++ b/tests/qemuxmlconftest.c
-@@ -2715,6 +2715,7 @@ mymain(void)
-      * virDomainMemoryDefCheckConflict() works for NVDIMMs which are special
-      * than other memory devices because of how they handle <labelsize/> */
-     DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-overlap");
-+    DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-virtio-mem-pci-s390x", "s390x");
- 
-     DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-on-caps", "s390x");
-     DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-on-cap", "s390x");
--- 
-2.49.0
diff --git a/SOURCES/libvirt-qemuxmlconftest-Refactor-host-device-preparation.patch b/SOURCES/libvirt-qemuxmlconftest-Refactor-host-device-preparation.patch
new file mode 100644
index 0000000..b1ce507
--- /dev/null
+++ b/SOURCES/libvirt-qemuxmlconftest-Refactor-host-device-preparation.patch
@@ -0,0 +1,101 @@
+From 276b0655a20762b1267a9e4212d266d632633103 Mon Sep 17 00:00:00 2001
+Message-ID: <276b0655a20762b1267a9e4212d266d632633103.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sat, 14 Feb 2026 11:39:19 +0100
+Subject: [PATCH] qemuxmlconftest: Refactor host device preparation
+
+Create a single place for host device preparation code.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit cb23831c020a5fab33be417426b2746a73ecdd10)
+
+Conflicts:
+  - missing upstream commit b97afe28f54dae1d122baa33d1a371b68775b7b2
+    tests/qemuxmlconftest.c
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ tests/qemuxmlconftest.c | 59 ++++++++++++++++++++++++++++++-----------
+ 1 file changed, 43 insertions(+), 16 deletions(-)
+
+diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
+index 27e63cff24..7c2dc3697b 100644
+--- a/tests/qemuxmlconftest.c
++++ b/tests/qemuxmlconftest.c
+@@ -378,6 +378,48 @@ testSetupHostdevPrivateData(virDomainDef *def)
+ }
+ 
+ 
++static void
++testQemuPrepareHostdevUSB(virDomainHostdevDef *hostdev)
++{
++    virDomainHostdevSubsysUSB *usb = &hostdev->source.subsys.u.usb;
++
++    if (!usb->device && !usb->bus) {
++        if (usb->vendor == 0x1234 && usb->product == 0x4321) {
++            usb->bus = 42;
++            usb->device = 0x1234;
++        } else {
++            g_assert_not_reached();
++        }
++    }
++}
++
++
++static void
++testQemuPrepareHostdev(virDomainObj *vm)
++{
++    size_t i;
++
++    for (i = 0; i < vm->def->nhostdevs; i++) {
++        virDomainHostdevDef *hostdev = vm->def->hostdevs[i];
++
++        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
++            continue;
++
++        switch (hostdev->source.subsys.type) {
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
++            testQemuPrepareHostdevUSB(hostdev);
++            break;
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
++            break;
++        }
++    }
++}
++
++
+ static virNetworkDriver fakeNetworkDriver = {
+     .networkLookupByName = fakeNetworkLookupByName,
+     .networkGetXMLDesc = fakeNetworkGetXMLDesc,
+@@ -524,22 +566,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
+         }
+     }
+ 
+-    for (i = 0; i < vm->def->nhostdevs; i++) {
+-        virDomainHostdevDef *hostdev = vm->def->hostdevs[i];
+-
+-        if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
+-            hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) {
+-            virDomainHostdevSubsysUSB *usb = &hostdev->source.subsys.u.usb;
+-            if (!usb->device && !usb->bus) {
+-                if (usb->vendor == 0x1234 && usb->product == 0x4321) {
+-                    usb->bus = 42;
+-                    usb->device = 0x1234;
+-                } else {
+-                    g_assert_not_reached();
+-                }
+-            }
+-        }
+-    }
++    testQemuPrepareHostdev(vm);
+ 
+     if (flags & FLAG_SLIRP_HELPER) {
+         for (i = 0; i < vm->def->nnets; i++) {
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemuxmlconftest-Rename-and-refactor-testSetupHostdevPrivateData.patch b/SOURCES/libvirt-qemuxmlconftest-Rename-and-refactor-testSetupHostdevPrivateData.patch
new file mode 100644
index 0000000..e6ac6b4
--- /dev/null
+++ b/SOURCES/libvirt-qemuxmlconftest-Rename-and-refactor-testSetupHostdevPrivateData.patch
@@ -0,0 +1,78 @@
+From 65c6fc2f31c865cbdd98f9c2edf28727d71486eb Mon Sep 17 00:00:00 2001
+Message-ID: <65c6fc2f31c865cbdd98f9c2edf28727d71486eb.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sat, 14 Feb 2026 11:48:53 +0100
+Subject: [PATCH] qemuxmlconftest: Rename and refactor
+ testSetupHostdevPrivateData
+
+There is no need to call qemuDomainHostdevPrivateNew() because
+privateData is allocated on creation by virDomainHostdevDefNew().
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 15ad45758bcb674924ddb2ebb86a767cf40b990d)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ tests/qemuxmlconftest.c | 29 +++++++----------------------
+ 1 file changed, 7 insertions(+), 22 deletions(-)
+
+diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
+index 7c2dc3697b..8275eacb3e 100644
+--- a/tests/qemuxmlconftest.c
++++ b/tests/qemuxmlconftest.c
+@@ -352,28 +352,13 @@ fakeNetworkPortGetXMLDesc(virNetworkPortPtr port,
+ 
+ 
+ static void
+-testSetupHostdevPrivateData(virDomainDef *def)
++testQemuPrepareHostdevPCI(virDomainHostdevDef *hostdev)
+ {
+-    size_t i;
++    qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
+ 
+-    for (i = 0; i < def->nhostdevs; i++) {
+-        virDomainHostdevDef *hostdev = def->hostdevs[i];
+-
+-        if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
+-            hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
+-            hostdev->source.subsys.u.pci.driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO &&
+-            hostdev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES) {
+-
+-            qemuDomainHostdevPrivate *priv;
+-
+-            if (!hostdev->privateData) {
+-                hostdev->privateData = qemuDomainHostdevPrivateNew();
+-            }
+-
+-            priv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
+-            /* Use a placeholder FD value for tests */
+-            priv->vfioDeviceFd = 0;
+-        }
++    if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) {
++        /* Use a placeholder FD value for tests */
++        hostdevPriv->vfioDeviceFd = 0;
+     }
+ }
+ 
+@@ -410,6 +395,8 @@ testQemuPrepareHostdev(virDomainObj *vm)
+             testQemuPrepareHostdevUSB(hostdev);
+             break;
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
++            testQemuPrepareHostdevPCI(hostdev);
++            break;
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
+@@ -473,8 +460,6 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
+     if (testQemuPrepareHostBackendChardevOne(NULL, priv->monConfig, vm) < 0)
+         return NULL;
+ 
+-    testSetupHostdevPrivateData(vm->def);
+-
+     for (i = 0; i < vm->def->ndisks; i++) {
+         virDomainDiskDef *disk = vm->def->disks[i];
+         virStorageSource *src;
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-qemuxmlconftest-Set-fake-FD-for-IOMMUFD.patch b/SOURCES/libvirt-qemuxmlconftest-Set-fake-FD-for-IOMMUFD.patch
new file mode 100644
index 0000000..3392d30
--- /dev/null
+++ b/SOURCES/libvirt-qemuxmlconftest-Set-fake-FD-for-IOMMUFD.patch
@@ -0,0 +1,98 @@
+From 8f562433cdcff89930c3a9ffac26803e733b796e Mon Sep 17 00:00:00 2001
+Message-ID: <8f562433cdcff89930c3a9ffac26803e733b796e.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sat, 14 Feb 2026 17:11:44 +0100
+Subject: [PATCH] qemuxmlconftest: Set fake FD for IOMMUFD
+
+Same as for VFIO FD for host device.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 4a80a0468e21866d11f08bd64888f399cff98d94)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args          | 2 +-
+ .../iommufd-virt-pci-bus-single.aarch64-latest.args           | 2 +-
+ tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args        | 2 +-
+ tests/qemuxmlconfdata/iommufd.x86_64-latest.args              | 2 +-
+ tests/qemuxmlconftest.c                                       | 4 ++++
+ 5 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
+index 7d819e141b..d5fe704021 100644
+--- a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
+@@ -35,7 +35,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
+ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \
+ -global ICH9-LPC.noreboot=off \
+ -watchdog-action reset \
+--object '{"qom-type":"iommufd","id":"iommufd0","fd":"-1"}' \
++-object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \
+ -device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x3"}' \
+ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+ -msg timestamp=on
+diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
+index dbfd395168..99886468fb 100644
+--- a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
++++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
+@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
+ -no-shutdown \
+ -boot strict=on \
+ -audiodev '{"id":"audio1","driver":"none"}' \
+--object '{"qom-type":"iommufd","id":"iommufd0","fd":"-1"}' \
++-object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \
+ -device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x1"}' \
+ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+ -msg timestamp=on
+diff --git a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
+index d5713ff826..e3695c6982 100644
+--- a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
++++ b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
+@@ -30,7 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
+ -device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
+ -device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \
+ -audiodev '{"id":"audio1","driver":"none"}' \
+--object '{"qom-type":"iommufd","id":"iommufd0","fd":"-1"}' \
++-object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \
+ -device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.1","addr":"0x0"}' \
+ -device '{"driver":"vfio-pci","host":"0000:07:12.5","id":"hostdev1","iommufd":"iommufd0","fd":"0","bus":"pci.2","addr":"0x0"}' \
+ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
+index 3130ba2e3a..15dabe197c 100644
+--- a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
++++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
+@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
+ -boot strict=on \
+ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+ -audiodev '{"id":"audio1","driver":"none"}' \
+--object '{"qom-type":"iommufd","id":"iommufd0","fd":"-1"}' \
++-object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \
+ -device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.0","addr":"0x3"}' \
+ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
+index 8275eacb3e..885512a38c 100644
+--- a/tests/qemuxmlconftest.c
++++ b/tests/qemuxmlconftest.c
+@@ -382,6 +382,7 @@ testQemuPrepareHostdevUSB(virDomainHostdevDef *hostdev)
+ static void
+ testQemuPrepareHostdev(virDomainObj *vm)
+ {
++    qemuDomainObjPrivate *priv = QEMU_DOMAIN_PRIVATE(vm);
+     size_t i;
+ 
+     for (i = 0; i < vm->def->nhostdevs; i++) {
+@@ -404,6 +405,9 @@ testQemuPrepareHostdev(virDomainObj *vm)
+             break;
+         }
+     }
++
++    if (virDomainDefHasPCIHostdevWithIOMMUFD(vm->def))
++        priv->iommufd = 0;
+ }
+ 
+ 
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-redhat-Restore-hunks-in-tests-qemucapabilitiesdata-caps_10.0.0_s390x.patch b/SOURCES/libvirt-redhat-Restore-hunks-in-tests-qemucapabilitiesdata-caps_10.0.0_s390x.patch
deleted file mode 100644
index 7c34ee9..0000000
--- a/SOURCES/libvirt-redhat-Restore-hunks-in-tests-qemucapabilitiesdata-caps_10.0.0_s390x.patch
+++ /dev/null
@@ -1,534 +0,0 @@
-From 0261587fd9afe1c83d7d2e2d0666c1613aece94e Mon Sep 17 00:00:00 2001
-Message-ID: <0261587fd9afe1c83d7d2e2d0666c1613aece94e.1749039441.git.jdenemar@redhat.com>
-From: Thomas Huth <thuth@redhat.com>
-Date: Mon, 12 May 2025 14:48:12 +0200
-Subject: [PATCH] redhat: Restore hunks in
- tests/qemucapabilitiesdata/caps_10.0.0_s390x.*
-
-These hunks were ommitted from the backport in commit dd7b0824364c
-("tests: add capabilities for QEMU 10.0.0 on s390x"). Now that we've
-backported the corresponding feature to RHEL 9, we have to restore the
-hunks to make the tests working again.
-
-JIRA: https://issues.redhat.com/browse/RHEL-89415
-Upstream Status: RHEL-only
-                 (Hunks taken from commit 652b2eeaa91ebde76b951593e4f77ec3)
-Signed-off-by: Thomas Huth <thuth@redhat.com>
----
- .../caps_10.0.0_s390x.replies                 | 447 +++++++++++++++++-
- .../caps_10.0.0_s390x.xml                     |  13 +
- 2 files changed, 458 insertions(+), 2 deletions(-)
-
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
-index 18f098153d..385c163441 100644
---- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
-@@ -32985,6 +32985,173 @@
-   "id": "libvirt-42"
- }
- 
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "host"
-+    }
-+  },
-+  "id": "libvirt-43"
-+}
-+
-+{
-+  "return": {
-+    "deprecated-props": [
-+      "bpb",
-+      "te",
-+      "cte",
-+      "csske"
-+    ],
-+    "model": {
-+      "name": "gen16a-base",
-+      "props": {
-+        "pfmfi": false,
-+        "exrl": true,
-+        "stfle45": true,
-+        "nnpa": true,
-+        "cmma": false,
-+        "dateh2": true,
-+        "gen17ptff": false,
-+        "aen": true,
-+        "gen13ptff": true,
-+        "dateh": true,
-+        "ccf": false,
-+        "cmmnt": true,
-+        "iacc2": true,
-+        "parseh": true,
-+        "csst": true,
-+        "idter": false,
-+        "idtes": true,
-+        "msa": true,
-+        "vxpdeh": true,
-+        "aefsi": true,
-+        "diag318": true,
-+        "hpma2": false,
-+        "csst2": true,
-+        "csske": true,
-+        "mepoch": true,
-+        "msa9": true,
-+        "msa8": true,
-+        "msa7": true,
-+        "msa6": true,
-+        "msa5": true,
-+        "msa4": true,
-+        "msa3": true,
-+        "msa2": true,
-+        "msa1": true,
-+        "msa13_pckmo": false,
-+        "msa11_pckmo": false,
-+        "msa10_pckmo": false,
-+        "sthyi": true,
-+        "stckf": true,
-+        "stfle": true,
-+        "etf3": true,
-+        "etf2": true,
-+        "edat": true,
-+        "hfpm": true,
-+        "ri": true,
-+        "minste4": false,
-+        "deflate": true,
-+        "msa13": false,
-+        "msa12": false,
-+        "msa11": false,
-+        "msa10": false,
-+        "edat2": true,
-+        "hfpue": true,
-+        "unpack": false,
-+        "dfp": true,
-+        "vxpdeh3": false,
-+        "mvcos": true,
-+        "etoken": true,
-+        "sprogp": true,
-+        "sigpif": false,
-+        "ldisphp": true,
-+        "vx": true,
-+        "ipter": true,
-+        "pai": true,
-+        "emon": true,
-+        "cei": false,
-+        "cmpsceh": true,
-+        "ginste": true,
-+        "paie": true,
-+        "dfppc": true,
-+        "dfpzc": true,
-+        "dfphp": true,
-+        "stfle49": true,
-+        "mepochptff": true,
-+        "opc": true,
-+        "ap": true,
-+        "asnlxr": true,
-+        "gpereh": false,
-+        "sif": false,
-+        "minste2": true,
-+        "vxeh": true,
-+        "vxpd": true,
-+        "esop": true,
-+        "ectg": true,
-+        "ib": false,
-+        "msa9_pckmo": true,
-+        "siif": false,
-+        "vxeh3": false,
-+        "vxeh2": true,
-+        "tsi": true,
-+        "tpei": false,
-+        "esan3": true,
-+        "esort": true,
-+        "fpe": true,
-+        "ibs": false,
-+        "zarch": true,
-+        "appv": true,
-+        "apqi": true,
-+        "apft": true,
-+        "stfle53": true,
-+        "els": true,
-+        "sief2": false,
-+        "eimm": true,
-+        "iep": true,
-+        "irbm": false,
-+        "srs": true,
-+        "ineff_nc_tx": false,
-+        "appvi": true,
-+        "apqci": true,
-+        "kss": false,
-+        "cte": true,
-+        "ais": true,
-+        "fpseh": true,
-+        "ltlbc": true,
-+        "ldisp": true,
-+        "bpb": true,
-+        "64bscao": false,
-+        "ctop": true,
-+        "gs": true,
-+        "sema": true,
-+        "etf3eh": true,
-+        "etf2eh": true,
-+        "eec": true,
-+        "ppa15": true,
-+        "zpci": true,
-+        "rdp": true,
-+        "nonqks": true,
-+        "sea_esop2": true,
-+        "minste3": true,
-+        "plo_ext": false,
-+        "beareh": true,
-+        "pfpo": true,
-+        "te": true,
-+        "cmm": true,
-+        "tods": true,
-+        "plo": true,
-+        "gsls": false,
-+        "skey": false,
-+        "vxpdeh2": true
-+      }
-+    }
-+  },
-+  "id": "libvirt-43"
-+}
-+
- {
-   "execute": "qmp_capabilities",
-   "id": "libvirt-1"
-@@ -37433,10 +37600,286 @@
- }
- 
- {
--  "execute": "query-machines",
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "max"
-+    }
-+  },
-   "id": "libvirt-4"
- }
- 
-+{
-+  "return": {
-+    "deprecated-props": [
-+      "bpb",
-+      "te",
-+      "cte",
-+      "csske"
-+    ],
-+    "model": {
-+      "name": "gen15a-base",
-+      "props": {
-+        "pfmfi": false,
-+        "exrl": true,
-+        "stfle45": true,
-+        "kmctr-etdea-192": false,
-+        "kmctr-etdea-128": false,
-+        "nnpa": false,
-+        "cmma": false,
-+        "dateh2": false,
-+        "gen17ptff": false,
-+        "gen13ptff": false,
-+        "aen": true,
-+        "kmo-etdea-192": false,
-+        "kmf-etdea-192": false,
-+        "kmc-etdea-192": false,
-+        "kmac-tdea-192": false,
-+        "kimd-sha-512": true,
-+        "dateh": true,
-+        "km-aes-256": false,
-+        "km-aes-192": false,
-+        "kmctr-aes-256": false,
-+        "ccf": false,
-+        "kma-gcm-eaes-192": false,
-+        "kmo-tdea-192": false,
-+        "kmf-tdea-192": false,
-+        "kmctr-tdea-192": false,
-+        "kmctr-tdea-128": false,
-+        "km-etdea-192": false,
-+        "kmc-tdea-192": false,
-+        "cmmnt": false,
-+        "iacc2": true,
-+        "parseh": false,
-+        "klmd-sha-512": true,
-+        "kma-gcm-eaes-128": false,
-+        "csst": true,
-+        "pcc-xts-aes-256": false,
-+        "pcc-xts-aes-128": false,
-+        "pckmo-aes-128": false,
-+        "idter": false,
-+        "idtes": true,
-+        "prno-trng-qrtcr": false,
-+        "pcc-cmac-eaes-128": false,
-+        "vxpdeh": false,
-+        "aefsi": true,
-+        "pckmo-etdea-192": false,
-+        "pckmo-etdea-128": false,
-+        "diag318": false,
-+        "pcc-cmac-eaes-256": false,
-+        "msa-base": true,
-+        "pcc-cmac-etdea-192": false,
-+        "hpma2": false,
-+        "kmctr-eaes-256": false,
-+        "csske": false,
-+        "csst2": true,
-+        "mepoch": false,
-+        "msa9": false,
-+        "msa6": false,
-+        "msa1": false,
-+        "kmctr-aes-192": false,
-+        "msa13_pckmo": false,
-+        "msa11_pckmo": false,
-+        "msa10_pckmo": false,
-+        "pckmo-aes-256": false,
-+        "sthyi": false,
-+        "stckf": true,
-+        "stfle": true,
-+        "edat": false,
-+        "etf3": true,
-+        "etf2": true,
-+        "hfpm": false,
-+        "ri": false,
-+        "minste4": false,
-+        "pcc-xts-eaes-256": false,
-+        "deflate": false,
-+        "msa13": false,
-+        "msa12": false,
-+        "msa11": false,
-+        "msa10": false,
-+        "km-xts-eaes-256": false,
-+        "km-xts-eaes-128": false,
-+        "edat2": false,
-+        "hfpue": false,
-+        "kmo-aes-192": false,
-+        "kmf-aes-192": false,
-+        "km-eaes-192": false,
-+        "kmc-aes-192": false,
-+        "unpack": false,
-+        "dfp": false,
-+        "kmo-aes-128": false,
-+        "kmf-aes-128": false,
-+        "km-eaes-128": false,
-+        "kmctr-dea": false,
-+        "vxpdeh3": false,
-+        "mvcos": true,
-+        "etoken": false,
-+        "pcc-cmac-tdea-192": false,
-+        "km-dea": false,
-+        "sprogp": true,
-+        "sigpif": false,
-+        "kmac-eaes-128": false,
-+        "ldisphp": true,
-+        "pckmo-aes-192": false,
-+        "ipter": false,
-+        "vx": true,
-+        "pai": false,
-+        "kimd-ghash": false,
-+        "emon": false,
-+        "kimd-sha-1": false,
-+        "cei": false,
-+        "cmpsceh": false,
-+        "kmctr-eaes-192": false,
-+        "kmctr-eaes-128": false,
-+        "ginste": true,
-+        "km-xts-aes-256": false,
-+        "kmac-eaes-256": false,
-+        "kmo-eaes-128": false,
-+        "kmf-eaes-128": false,
-+        "kmc-eaes-128": false,
-+        "kmac-aes-128": false,
-+        "paie": false,
-+        "dfppc": false,
-+        "dfpzc": false,
-+        "dfphp": false,
-+        "kmo-eaes-256": false,
-+        "kmf-eaes-256": false,
-+        "kmc-eaes-256": false,
-+        "kmac-aes-256": false,
-+        "kmac-etdea-192": false,
-+        "kmac-etdea-128": false,
-+        "kmo-dea": false,
-+        "kmf-dea": false,
-+        "km-edea": false,
-+        "kmc-dea": false,
-+        "stfle49": true,
-+        "klmd-sha-1": false,
-+        "mepochptff": false,
-+        "opc": false,
-+        "ap": false,
-+        "asnlxr": false,
-+        "gpereh": false,
-+        "sif": false,
-+        "minste2": true,
-+        "pcc-cmac-dea": false,
-+        "vxpd": false,
-+        "vxeh": true,
-+        "esop": true,
-+        "ectg": true,
-+        "ib": false,
-+        "km-tdea-192": false,
-+        "km-tdea-128": false,
-+        "msa9_pckmo": false,
-+        "siif": false,
-+        "kma-gcm-aes-256": false,
-+        "kma-gcm-aes-192": false,
-+        "kma-gcm-aes-128": false,
-+        "pcc-cmac-aes-256": false,
-+        "vxeh3": false,
-+        "tsi": false,
-+        "vxeh2": true,
-+        "tpei": false,
-+        "esort": false,
-+        "esan3": true,
-+        "fpe": true,
-+        "ibs": false,
-+        "pcc-xts-eaes-128": false,
-+        "kmac-eaes-192": false,
-+        "zarch": true,
-+        "kmo-edea": false,
-+        "kmf-edea": false,
-+        "kmc-edea": false,
-+        "kmac-dea": false,
-+        "appv": false,
-+        "apqi": false,
-+        "apft": false,
-+        "stfle53": true,
-+        "ppno-sha-512-drng": false,
-+        "pcc-cmac-tdea-128": false,
-+        "kmo-aes-256": false,
-+        "kmf-aes-256": false,
-+        "km-eaes-256": false,
-+        "kmc-aes-256": false,
-+        "els": false,
-+        "sief2": false,
-+        "eimm": true,
-+        "pcc-cmac-etdea-128": false,
-+        "iep": true,
-+        "irbm": false,
-+        "km-xts-aes-128": false,
-+        "srs": true,
-+        "appvi": false,
-+        "ineff_nc_tx": false,
-+        "apqci": false,
-+        "kmo-tdea-128": false,
-+        "kmf-tdea-128": false,
-+        "km-etdea-128": false,
-+        "kmc-tdea-128": false,
-+        "kss": false,
-+        "cte": false,
-+        "kmac-edea": false,
-+        "prno-trng": true,
-+        "kma-gcm-eaes-256": false,
-+        "ais": true,
-+        "fpseh": true,
-+        "ltlbc": true,
-+        "ldisp": true,
-+        "kmo-etdea-128": false,
-+        "kmf-etdea-128": false,
-+        "kmc-etdea-128": false,
-+        "kmac-tdea-128": false,
-+        "pcc-cmac-edea": false,
-+        "bpb": false,
-+        "kmctr-edea": false,
-+        "64bscao": false,
-+        "ctop": false,
-+        "kmo-eaes-192": false,
-+        "kmf-eaes-192": false,
-+        "kmc-eaes-192": false,
-+        "kmac-aes-192": false,
-+        "gs": false,
-+        "sema": false,
-+        "etf3eh": true,
-+        "etf2eh": true,
-+        "eec": false,
-+        "pcc-cmac-eaes-192": false,
-+        "ppa15": false,
-+        "kmc-prng": false,
-+        "zpci": true,
-+        "rdp": false,
-+        "nonqks": false,
-+        "sea_esop2": true,
-+        "minste3": true,
-+        "plo_ext": false,
-+        "beareh": false,
-+        "pfpo": false,
-+        "te": false,
-+        "msa8-base": true,
-+        "msa4-base": true,
-+        "msa3-base": true,
-+        "msa5-base": true,
-+        "pcc-cmac-aes-192": false,
-+        "cmm": false,
-+        "tods": false,
-+        "pcc-cmac-aes-128": false,
-+        "plo": true,
-+        "pckmo-edea": false,
-+        "gsls": false,
-+        "kmctr-aes-128": false,
-+        "skey": false,
-+        "vxpdeh2": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-5"
-+}
-+
- {
-   "return": [
-     {
-@@ -37709,5 +38152,5 @@
-       "default-ram-id": "s390.ram"
-     }
-   ],
--  "id": "libvirt-4"
-+  "id": "libvirt-5"
- }
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
-index 82cabd13b2..1d7d415e5b 100644
---- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
-@@ -139,6 +139,7 @@
-   <flag name='chardev-reconnect-miliseconds'/>
-   <flag name='virtio-ccw.loadparm'/>
-   <flag name='netdev-stream-reconnect-miliseconds'/>
-+  <flag name='query-cpu-model-expansion.deprecated-props'/>
-   <flag name='virtio-mem-ccw'/>
-   <version>9002050</version>
-   <microcodeVersion>39100285</microcodeVersion>
-@@ -200,6 +201,12 @@
-     <property name='te' type='boolean' value='true'/>
-     <property name='cmm' type='boolean' value='true'/>
-     <property name='vxpdeh2' type='boolean' value='true'/>
-+    <deprecatedFeatures>
-+      <property name='bpb'/>
-+      <property name='te'/>
-+      <property name='cte'/>
-+      <property name='csske'/>
-+    </deprecatedFeatures>
-   </hostCPU>
-   <cpu type='kvm' name='z13' typename='z13-s390x-cpu' usable='yes'/>
-   <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/>
-@@ -398,6 +405,12 @@
-     <property name='msa3-base' type='boolean' value='true'/>
-     <property name='msa5-base' type='boolean' value='true'/>
-     <property name='tods' type='boolean' value='false'/>
-+    <deprecatedFeatures>
-+      <property name='bpb'/>
-+      <property name='te'/>
-+      <property name='cte'/>
-+      <property name='csske'/>
-+    </deprecatedFeatures>
-   </hostCPU>
-   <cpu type='tcg' name='z13' typename='z13-s390x-cpu' usable='no'>
-     <blocker name='ppno-sha-512-drng'/>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-remote-add-sysusers-file-to-create-libvirt-group.patch b/SOURCES/libvirt-remote-add-sysusers-file-to-create-libvirt-group.patch
deleted file mode 100644
index c2c5c4a..0000000
--- a/SOURCES/libvirt-remote-add-sysusers-file-to-create-libvirt-group.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 44fc545f45e2e0077fbdc9d45bf8743d115fca35 Mon Sep 17 00:00:00 2001
-Message-ID: <44fc545f45e2e0077fbdc9d45bf8743d115fca35.1741876175.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 29 Jan 2025 15:37:46 +0000
-Subject: [PATCH] remote: add sysusers file to create 'libvirt' group
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We previously added a sysusers file, but missed the 'libvirt' group.
-This group is referenced in the polkit rules, so we should be
-registering that too. It must be done in a separate sysusers file,
-however, since it is common to all daemons.
-
-Fixes: a2c3e390f7bedf36f4ddc544d09fe3b8772c5c6f
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 18f0160994af80dfac2dcaf46097922e443b283b)
-
-https://issues.redhat.com/browse/RHEL-81749
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
----
- libvirt.spec.in                  | 1 +
- src/remote/libvirt.sysusers.conf | 1 +
- src/remote/meson.build           | 7 +++++++
- 3 files changed, 9 insertions(+)
- create mode 100644 src/remote/libvirt.sysusers.conf
-
-diff --git a/src/remote/libvirt.sysusers.conf b/src/remote/libvirt.sysusers.conf
-new file mode 100644
-index 0000000000..50c6716cce
---- /dev/null
-+++ b/src/remote/libvirt.sysusers.conf
-@@ -0,0 +1 @@
-+g libvirt -
-diff --git a/src/remote/meson.build b/src/remote/meson.build
-index 831acaaa01..a96eaa1047 100644
---- a/src/remote/meson.build
-+++ b/src/remote/meson.build
-@@ -307,6 +307,13 @@ if conf.has('WITH_REMOTE')
-       )
-     endif
- 
-+    # Install the sysuser config for the daemon polkit rules
-+    install_data(
-+      'libvirt.sysusers.conf',
-+      install_dir: sysusersdir,
-+      rename: [ 'libvirt.conf' ],
-+    )
-+
-     virt_helpers += {
-       'name': 'virt-ssh-helper',
-       'sources': [
--- 
-2.48.1
diff --git a/SOURCES/libvirt-rpc-remove-logind-support-for-virNetDaemon.patch b/SOURCES/libvirt-rpc-remove-logind-support-for-virNetDaemon.patch
deleted file mode 100644
index 7afc5c5..0000000
--- a/SOURCES/libvirt-rpc-remove-logind-support-for-virNetDaemon.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 3c4c4271c77ffe624cae83f3cfec15bf0196b774 Mon Sep 17 00:00:00 2001
-Message-ID: <3c4c4271c77ffe624cae83f3cfec15bf0196b774.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 16 Dec 2024 16:37:52 +0000
-Subject: [PATCH] rpc: remove logind support for virNetDaemon
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The virNetDaemon code now only concerns itself with preventing auto
-shutdown of the local daemon. Logind is now handled by the new
-virInhibitor object, for QEMU, LXC and LibXL. This fixes two notable
-bugs
-
- * Running virtual networks would prevent system shutdown
- * Loaded ephemeral secrets would prevent system shutdown
-
-Fixes 9e3cc0ff5e81ed2056a6a528893fd2cb5609d70b
-Fixes 37800af9a400385801da6d73654249fdb51a93d8
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 8575724aef4f48f3d66cb7beb4c61014992e31eb)
-Resolves: https://issues.redhat.com/browse/RHEL-83064
----
- src/libxl/libxl_driver.c |  2 +-
- src/lxc/lxc_driver.c     |  2 +-
- src/qemu/qemu_driver.c   |  2 +-
- src/rpc/virnetdaemon.c   | 78 ----------------------------------------
- 4 files changed, 3 insertions(+), 81 deletions(-)
-
-diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index ecd6ea9fa8..2a4f31f93c 100644
---- a/src/libxl/libxl_driver.c
-+++ b/src/libxl/libxl_driver.c
-@@ -707,7 +707,7 @@ libxlStateInitialize(bool privileged,
-         goto error;
- 
-     libxl_driver->inhibitor = virInhibitorNew(
--        VIR_INHIBITOR_WHAT_NONE,
-+        VIR_INHIBITOR_WHAT_SHUTDOWN,
-         _("Libvirt Xen"),
-         _("Xen virtual machines are running"),
-         VIR_INHIBITOR_MODE_DELAY,
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index 9ee771c62a..72b950ac8a 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -1488,7 +1488,7 @@ lxcStateInitialize(bool privileged,
-         goto cleanup;
- 
-     lxc_driver->inhibitor = virInhibitorNew(
--        VIR_INHIBITOR_WHAT_NONE,
-+        VIR_INHIBITOR_WHAT_SHUTDOWN,
-         _("Libvirt LXC"),
-         _("LXC containers are running"),
-         VIR_INHIBITOR_MODE_DELAY,
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 5b911d5221..f8f3d2c725 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -673,7 +673,7 @@ qemuStateInitialize(bool privileged,
-     }
- 
-     qemu_driver->inhibitor = virInhibitorNew(
--        VIR_INHIBITOR_WHAT_NONE,
-+        VIR_INHIBITOR_WHAT_SHUTDOWN,
-         _("Libvirt QEMU"),
-         _("QEMU/KVM virtual machines are running"),
-         VIR_INHIBITOR_MODE_DELAY,
-diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
-index 9795418126..e4c6261536 100644
---- a/src/rpc/virnetdaemon.c
-+++ b/src/rpc/virnetdaemon.c
-@@ -31,7 +31,6 @@
- #include "virutil.h"
- #include "virfile.h"
- #include "virnetserver.h"
--#include "virgdbus.h"
- #include "virhash.h"
- #include "virprocess.h"
- #include "virsystemd.h"
-@@ -80,7 +79,6 @@ struct _virNetDaemon {
-     int autoShutdownTimerID;
-     bool autoShutdownTimerActive;
-     size_t autoShutdownInhibitions;
--    int autoShutdownInhibitFd;
- };
- 
- 
-@@ -109,7 +107,6 @@ virNetDaemonDispose(void *obj)
-         virEventRemoveHandle(dmn->sigwatch);
- #endif /* !WIN32 */
- 
--    VIR_FORCE_CLOSE(dmn->autoShutdownInhibitFd);
-     g_free(dmn->stateStopThread);
- 
-     g_clear_pointer(&dmn->servers, g_hash_table_unref);
-@@ -150,7 +147,6 @@ virNetDaemonNew(void)
- #endif /* !WIN32 */
- 
-     dmn->privileged = geteuid() == 0;
--    dmn->autoShutdownInhibitFd = -1;
- 
-     virProcessActivateMaxFiles();
- 
-@@ -491,66 +487,6 @@ virNetDaemonAutoShutdown(virNetDaemon *dmn,
- }
- 
- 
--#ifdef G_OS_UNIX
--/* As per: https://www.freedesktop.org/wiki/Software/systemd/inhibit */
--static void
--virNetDaemonCallInhibit(virNetDaemon *dmn,
--                        const char *what,
--                        const char *who,
--                        const char *why,
--                        const char *mode)
--{
--    g_autoptr(GVariant) reply = NULL;
--    g_autoptr(GUnixFDList) replyFD = NULL;
--    g_autoptr(GVariant) message = NULL;
--    GDBusConnection *systemBus;
--    int fd;
--    int rc;
--
--    VIR_DEBUG("dmn=%p what=%s who=%s why=%s mode=%s",
--              dmn, NULLSTR(what), NULLSTR(who), NULLSTR(why), NULLSTR(mode));
--
--    if (virSystemdHasLogind() < 0)
--        return;
--
--    if (!(systemBus = virGDBusGetSystemBus()))
--        return;
--
--    message = g_variant_new("(ssss)", what, who, why, mode);
--
--    rc = virGDBusCallMethodWithFD(systemBus,
--                                  &reply,
--                                  G_VARIANT_TYPE("(h)"),
--                                  &replyFD,
--                                  NULL,
--                                  "org.freedesktop.login1",
--                                  "/org/freedesktop/login1",
--                                  "org.freedesktop.login1.Manager",
--                                  "Inhibit",
--                                  message,
--                                  NULL);
--
--    if (rc < 0)
--        return;
--
--    if (g_unix_fd_list_get_length(replyFD) <= 0)
--        return;
--
--    fd = g_unix_fd_list_get(replyFD, 0, NULL);
--    if (fd < 0)
--        return;
--
--    if (dmn->autoShutdownInhibitions) {
--        dmn->autoShutdownInhibitFd = fd;
--        VIR_DEBUG("Got inhibit FD %d", fd);
--    } else {
--        /* We stopped the last VM since we made the inhibit call */
--        VIR_DEBUG("Closing inhibit FD %d", fd);
--        VIR_FORCE_CLOSE(fd);
--    }
--}
--#endif
--
- void
- virNetDaemonAddShutdownInhibition(virNetDaemon *dmn)
- {
-@@ -559,15 +495,6 @@ virNetDaemonAddShutdownInhibition(virNetDaemon *dmn)
-     dmn->autoShutdownInhibitions++;
- 
-     VIR_DEBUG("dmn=%p inhibitions=%zu", dmn, dmn->autoShutdownInhibitions);
--
--#ifdef G_OS_UNIX
--    if (dmn->autoShutdownInhibitions == 1)
--        virNetDaemonCallInhibit(dmn,
--                                "shutdown",
--                                _("Libvirt"),
--                                _("Virtual machines need to be saved"),
--                                "delay");
--#endif
- }
- 
- 
-@@ -579,11 +506,6 @@ virNetDaemonRemoveShutdownInhibition(virNetDaemon *dmn)
-     dmn->autoShutdownInhibitions--;
- 
-     VIR_DEBUG("dmn=%p inhibitions=%zu", dmn, dmn->autoShutdownInhibitions);
--
--    if (dmn->autoShutdownInhibitions == 0) {
--        VIR_DEBUG("Closing inhibit FD %d", dmn->autoShutdownInhibitFd);
--        VIR_FORCE_CLOSE(dmn->autoShutdownInhibitFd);
--    }
- }
- 
- 
--- 
-2.49.0
diff --git a/SOURCES/libvirt-src-Use-device-alias-when-ifname-is-unset-in-virDomainInterfaceAddresses.patch b/SOURCES/libvirt-src-Use-device-alias-when-ifname-is-unset-in-virDomainInterfaceAddresses.patch
new file mode 100644
index 0000000..8a4c93f
--- /dev/null
+++ b/SOURCES/libvirt-src-Use-device-alias-when-ifname-is-unset-in-virDomainInterfaceAddresses.patch
@@ -0,0 +1,98 @@
+From c07121de7fcb56a738c9b47ff8d7a9436da95d24 Mon Sep 17 00:00:00 2001
+Message-ID: <c07121de7fcb56a738c9b47ff8d7a9436da95d24.1770714416.git.jdenemar@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 20 Jan 2026 16:19:00 +0100
+Subject: [PATCH] src: Use device alias when ifname is unset in
+ virDomainInterfaceAddresses()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The virDomainInterfaceAddresses() API returns an array of
+_virDomainInterface structs which then describe IP addresses
+associated with given domain. The struct contains 'name' member
+which is documented deliberately vaguely: "interface name". This
+is because depending on the source of truth used (controlled by
+'source' argument) the name can be wildly different from the one
+in domain XML. Now, in case of source =
+VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP, the host's ARP table is
+parsed and matching interfaces are found by comparing MAC
+addresses. If it's a match then the 'name' is set to net->ifname
+(corresponds to /interface/target/@dev). But that is not always
+set and sometimes may be NULL (e.g. for hostdevs, usernet). We
+can't change the API (like we did for hwaddr in v1.2.14-rc1~105)
+because this is already released. So the next best thing to do is
+to put the interface alias in there.
+
+To be on a safe side, do the same change to the
+VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE case.
+
+Resolves: https://issues.redhat.com/browse/RHEL-141496
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4009126f17a19ea2f512f1952f4ea32d231ade85)
+Resolves: https://issues.redhat.com/browse/RHEL-141496
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/domain_conf.c | 16 ++++++++++++++--
+ src/libvirt-domain.c   |  2 ++
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index f950f7c75d..902c1188ef 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -15604,6 +15604,12 @@ virDomainNetDHCPInterfaces(virDomainDef *def,
+             goto error;
+ 
+         if (n_leases) {
++            const char *ifname = def->nets[i]->ifname;
++
++            if (!ifname) {
++                ifname = def->nets[i]->info.alias;
++            }
++
+             ifaces_ret = g_renew(virDomainInterfacePtr, ifaces_ret, ifaces_count + 1);
+             ifaces_ret[ifaces_count] = g_new0(virDomainInterface, 1);
+             iface = ifaces_ret[ifaces_count];
+@@ -15612,7 +15618,7 @@ virDomainNetDHCPInterfaces(virDomainDef *def,
+             /* Assuming each lease corresponds to a separate IP */
+             iface->naddrs = n_leases;
+             iface->addrs = g_new0(virDomainIPAddress, iface->naddrs);
+-            iface->name = g_strdup(def->nets[i]->ifname);
++            iface->name = g_strdup(ifname);
+             iface->hwaddr = g_strdup(macaddr);
+         }
+ 
+@@ -15666,9 +15672,15 @@ virDomainNetARPInterfaces(virDomainDef *def,
+             virArpTableEntry entry = table->t[j];
+ 
+             if (STREQ(entry.mac, macaddr)) {
++                const char *ifname = def->nets[i]->ifname;
++
++                if (!ifname) {
++                    ifname = def->nets[i]->info.alias;
++                }
++
+                 iface = g_new0(virDomainInterface, 1);
+ 
+-                iface->name = g_strdup(def->nets[i]->ifname);
++                iface->name = g_strdup(ifname);
+ 
+                 iface->hwaddr = g_strdup(macaddr);
+ 
+diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
+index 74c70a0a43..c7451fee05 100644
+--- a/src/libvirt-domain.c
++++ b/src/libvirt-domain.c
+@@ -12880,6 +12880,8 @@ virDomainFSInfoFree(virDomainFSInfoPtr info)
+  * Note that for some @source values some pieces of returned @ifaces
+  * might be unset (e.g. VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP does not
+  * set IP address prefix as ARP table does not have any notion of that).
++ * Moreover, it may happen that the interface doesn't have a name. In
++ * that case, @ifaces->name is set to the interface's device alias.
+  *
+  * @ifaces->name and @ifaces->hwaddr are never NULL.
+  *
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-src-convert-drivers-over-to-new-virInhibitor-APIs.patch b/SOURCES/libvirt-src-convert-drivers-over-to-new-virInhibitor-APIs.patch
deleted file mode 100644
index e9ed0d6..0000000
--- a/SOURCES/libvirt-src-convert-drivers-over-to-new-virInhibitor-APIs.patch
+++ /dev/null
@@ -1,549 +0,0 @@
-From 079d7a5d0a1dd198f96749d415295d8340476902 Mon Sep 17 00:00:00 2001
-Message-ID: <079d7a5d0a1dd198f96749d415295d8340476902.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 16 Dec 2024 16:28:48 +0000
-Subject: [PATCH] src: convert drivers over to new virInhibitor APIs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This initial conversion of the drivers switches them over to use
-the virInhibitor APIs in local daemon only mode. Communication to
-logind is still handled by the virNetDaemon class logic.
-
-This mostly just replaces upto 3 fields in the driver state
-with a single new virInhibitor object, but otherwise should not
-change functionality besides replacing atomics with mutex protected
-APIs.
-
-The exception is the LXC driver which has been trying to inhibit
-shutdown shutdown but silently failing to, since nothing ever
-remembered to set the 'inhibitCallback' pointer in the driver
-state struct.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 48f0b6dfa12563f0006d2de4b0f85599e20f9449)
-Resolves: https://issues.redhat.com/browse/RHEL-83064
----
- src/libxl/libxl_conf.h           |  9 +++----
- src/libxl/libxl_domain.c         |  6 ++---
- src/libxl/libxl_driver.c         | 15 +++++++----
- src/lxc/lxc_conf.h               |  9 +++----
- src/lxc/lxc_driver.c             | 13 +++++++--
- src/lxc/lxc_process.c            |  9 +++----
- src/network/bridge_driver.c      | 20 +++++++-------
- src/network/bridge_driver_conf.h |  9 +++----
- src/qemu/qemu_conf.h             |  9 +++----
- src/qemu/qemu_driver.c           | 12 ++++++---
- src/qemu/qemu_process.c          |  9 +++----
- src/secret/secret_driver.c       | 46 +++++++++++++-------------------
- 12 files changed, 80 insertions(+), 86 deletions(-)
-
-diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
-index 7087b41079..0edcde079d 100644
---- a/src/libxl/libxl_conf.h
-+++ b/src/libxl/libxl_conf.h
-@@ -35,6 +35,7 @@
- #include "virfirmware.h"
- #include "libxl_capabilities.h"
- #include "libxl_logger.h"
-+#include "virinhibitor.h"
- 
- #define LIBXL_DRIVER_EXTERNAL_NAME "Xen"
- /*
-@@ -117,12 +118,8 @@ struct _libxlDriverPrivate {
-     /* pid file FD, ensures two copies of the driver can't use the same root */
-     int lockFD;
- 
--    /* Atomic inc/dec only */
--    unsigned int nactive;
--
--    /* Immutable pointers. Caller must provide locking */
--    virStateInhibitCallback inhibitCallback;
--    void *inhibitOpaque;
-+    /* Immutable pointer, self-locking APIs */
-+    virInhibitor *inhibitor;
- 
-     /* Immutable pointer, self-locking APIs */
-     virDomainObjList *domains;
-diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
-index 711e22b8df..6805160923 100644
---- a/src/libxl/libxl_domain.c
-+++ b/src/libxl/libxl_domain.c
-@@ -873,8 +873,7 @@ libxlDomainCleanup(libxlDriverPrivate *driver,
-         priv->deathW = NULL;
-     }
- 
--    if (g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback)
--        driver->inhibitCallback(false, driver->inhibitOpaque);
-+    virInhibitorRelease(driver->inhibitor);
- 
-     /* Release auto-allocated graphics ports */
-     for (i = 0; i < vm->def->ngraphics; i++) {
-@@ -1418,8 +1417,7 @@ libxlDomainStart(libxlDriverPrivate *driver,
-         return -1;
-     }
- 
--    if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback)
--        driver->inhibitCallback(true, driver->inhibitOpaque);
-+    virInhibitorHold(driver->inhibitor);
- 
-     event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED,
-                                               restore_fd < 0 ?
-diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index b670e697c6..ecd6ea9fa8 100644
---- a/src/libxl/libxl_driver.c
-+++ b/src/libxl/libxl_driver.c
-@@ -437,8 +437,7 @@ libxlReconnectDomain(virDomainObj *vm,
-         virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
-                              VIR_DOMAIN_RUNNING_UNKNOWN);
- 
--    if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback)
--        driver->inhibitCallback(true, driver->inhibitOpaque);
-+    virInhibitorHold(driver->inhibitor);
- 
-     /* Enable domain death events */
-     libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW);
-@@ -514,6 +513,7 @@ libxlStateCleanup(void)
- 
-     virObjectUnref(libxl_driver->domainEventState);
-     virSysinfoDefFree(libxl_driver->hostsysinfo);
-+    virInhibitorFree(libxl_driver->inhibitor);
- 
-     if (libxl_driver->lockFD != -1)
-         virPidFileRelease(libxl_driver->config->stateDir, "driver", libxl_driver->lockFD);
-@@ -675,9 +675,6 @@ libxlStateInitialize(bool privileged,
-         return VIR_DRV_STATE_INIT_ERROR;
-     }
- 
--    libxl_driver->inhibitCallback = callback;
--    libxl_driver->inhibitOpaque = opaque;
--
-     /* Allocate bitmap for vnc port reservation */
-     if (!(libxl_driver->reservedGraphicsPorts =
-           virPortAllocatorRangeNew(_("VNC"),
-@@ -709,6 +706,14 @@ libxlStateInitialize(bool privileged,
-     if (libxlDriverConfigLoadFile(cfg, driverConf) < 0)
-         goto error;
- 
-+    libxl_driver->inhibitor = virInhibitorNew(
-+        VIR_INHIBITOR_WHAT_NONE,
-+        _("Libvirt Xen"),
-+        _("Xen virtual machines are running"),
-+        VIR_INHIBITOR_MODE_DELAY,
-+        callback,
-+        opaque);
-+
-     /* Register the callbacks providing access to libvirt's event loop */
-     libxl_osevent_register_hooks(cfg->ctx, &libxl_osevent_callbacks, cfg->ctx);
- 
-diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h
-index c0967ac63b..73c60c7ebf 100644
---- a/src/lxc/lxc_conf.h
-+++ b/src/lxc/lxc_conf.h
-@@ -30,6 +30,7 @@
- #include "virsysinfo.h"
- #include "virclosecallbacks.h"
- #include "virhostdev.h"
-+#include "virinhibitor.h"
- 
- #define LXC_DRIVER_NAME "LXC"
- 
-@@ -76,12 +77,8 @@ struct _virLXCDriver {
-     /* Immutable pointer, lockless APIs */
-     virSysinfoDef *hostsysinfo;
- 
--    /* Atomic inc/dec only */
--    unsigned int nactive;
--
--    /* Immutable pointers. Caller must provide locking */
--    virStateInhibitCallback inhibitCallback;
--    void *inhibitOpaque;
-+    /* Immutable pointer, self-locking APIs */
-+    virInhibitor *inhibitor;
- 
-     /* Immutable pointer, self-locking APIs */
-     virDomainObjList *domains;
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index 9609d7d10c..9ee771c62a 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -1433,8 +1433,8 @@ static virDrvStateInitResult
- lxcStateInitialize(bool privileged,
-                    const char *root,
-                    bool monolithic G_GNUC_UNUSED,
--                   virStateInhibitCallback callback G_GNUC_UNUSED,
--                   void *opaque G_GNUC_UNUSED)
-+                   virStateInhibitCallback callback,
-+                   void *opaque)
- {
-     virLXCDriverConfig *cfg = NULL;
-     bool autostart = true;
-@@ -1487,6 +1487,14 @@ lxcStateInitialize(bool privileged,
-     if (virLXCLoadDriverConfig(cfg, SYSCONFDIR "/libvirt/lxc.conf") < 0)
-         goto cleanup;
- 
-+    lxc_driver->inhibitor = virInhibitorNew(
-+        VIR_INHIBITOR_WHAT_NONE,
-+        _("Libvirt LXC"),
-+        _("LXC containers are running"),
-+        VIR_INHIBITOR_MODE_DELAY,
-+        callback,
-+        opaque);
-+
-     if (!(lxc_driver->securityManager = lxcSecurityInit(cfg)))
-         goto cleanup;
- 
-@@ -1591,6 +1599,7 @@ static int lxcStateCleanup(void)
-     virObjectUnref(lxc_driver->caps);
-     virObjectUnref(lxc_driver->securityManager);
-     virObjectUnref(lxc_driver->xmlopt);
-+    virInhibitorFree(lxc_driver->inhibitor);
- 
-     if (lxc_driver->lockFD != -1)
-         virPidFileRelease(lxc_driver->config->stateDir, "driver", lxc_driver->lockFD);
-diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
-index cd8bcfc282..c2982244f0 100644
---- a/src/lxc/lxc_process.c
-+++ b/src/lxc/lxc_process.c
-@@ -203,8 +203,7 @@ static void virLXCProcessCleanup(virLXCDriver *driver,
-     vm->pid = 0;
-     vm->def->id = -1;
- 
--    if (g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback)
--        driver->inhibitCallback(false, driver->inhibitOpaque);
-+    virInhibitorRelease(driver->inhibitor);
- 
-     virLXCDomainReAttachHostDevices(driver, vm->def);
- 
-@@ -1466,8 +1465,7 @@ int virLXCProcessStart(virLXCDriver * driver,
-     if (virCommandHandshakeNotify(cmd) < 0)
-         goto cleanup;
- 
--    if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback)
--        driver->inhibitCallback(true, driver->inhibitOpaque);
-+    virInhibitorHold(driver->inhibitor);
- 
-     /* The first synchronization point is when the controller creates CGroups. */
-     if (lxcContainerWaitForContinue(handshakefds[0]) < 0) {
-@@ -1665,8 +1663,7 @@ virLXCProcessReconnectDomain(virDomainObj *vm,
-         virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
-                              VIR_DOMAIN_RUNNING_UNKNOWN);
- 
--        if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback)
--            driver->inhibitCallback(true, driver->inhibitOpaque);
-+        virInhibitorHold(driver->inhibitor);
- 
-         if (!(priv->monitor = virLXCProcessConnectMonitor(driver, vm)))
-             goto error;
-diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
-index e700a614a9..ce793c12ef 100644
---- a/src/network/bridge_driver.c
-+++ b/src/network/bridge_driver.c
-@@ -504,8 +504,7 @@ networkUpdateState(virNetworkObj *obj,
-     if (virNetworkObjIsActive(obj)) {
-         virNetworkObjPortForEach(obj, networkUpdatePort, obj);
- 
--        if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback)
--            driver->inhibitCallback(true, driver->inhibitOpaque);
-+        virInhibitorHold(driver->inhibitor);
-     }
- 
-     /* Try and read dnsmasq pids of both active and inactive networks, just in
-@@ -644,9 +643,6 @@ networkStateInitialize(bool privileged,
-         goto error;
-     }
- 
--    network_driver->inhibitCallback = callback;
--    network_driver->inhibitOpaque = opaque;
--
-     network_driver->privileged = privileged;
- 
-     if (!(network_driver->xmlopt = networkDnsmasqCreateXMLConf()))
-@@ -655,6 +651,14 @@ networkStateInitialize(bool privileged,
-     if (!(network_driver->config = cfg = virNetworkDriverConfigNew(privileged)))
-         goto error;
- 
-+    network_driver->inhibitor = virInhibitorNew(
-+        VIR_INHIBITOR_WHAT_NONE,
-+        _("Libvirt Network"),
-+        _("Virtual networks are active"),
-+        VIR_INHIBITOR_MODE_DELAY,
-+        callback,
-+        opaque);
-+
-     if ((network_driver->lockFD =
-          virPidFileAcquire(cfg->stateDir, "driver", getpid())) < 0)
-         goto error;
-@@ -2432,8 +2436,7 @@ networkStartNetwork(virNetworkDriverState *driver,
-                                 obj, network_driver->xmlopt) < 0)
-         goto cleanup;
- 
--    if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback)
--        driver->inhibitCallback(true, driver->inhibitOpaque);
-+    virInhibitorHold(driver->inhibitor);
- 
-     virNetworkObjSetActive(obj, true);
-     VIR_INFO("Network '%s' started up", def->name);
-@@ -2509,8 +2512,7 @@ networkShutdownNetwork(virNetworkDriverState *driver,
- 
-     virNetworkObjSetActive(obj, false);
- 
--    if (g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback)
--        driver->inhibitCallback(false, driver->inhibitOpaque);
-+    virInhibitorRelease(driver->inhibitor);
- 
-     virNetworkObjUnsetDefTransient(obj);
-     return ret;
-diff --git a/src/network/bridge_driver_conf.h b/src/network/bridge_driver_conf.h
-index 1beed01efb..2a2e2bc16d 100644
---- a/src/network/bridge_driver_conf.h
-+++ b/src/network/bridge_driver_conf.h
-@@ -27,6 +27,7 @@
- #include "virnetworkobj.h"
- #include "object_event.h"
- #include "virfirewall.h"
-+#include "virinhibitor.h"
- 
- typedef struct _virNetworkDriverConfig virNetworkDriverConfig;
- struct _virNetworkDriverConfig {
-@@ -49,12 +50,8 @@ typedef struct _virNetworkDriverState virNetworkDriverState;
- struct _virNetworkDriverState {
-     virMutex lock;
- 
--    /* Atomic inc/dec only */
--    unsigned int nactive;
--
--    /* Immutable pointers. Caller must provide locking */
--    virStateInhibitCallback inhibitCallback;
--    void *inhibitOpaque;
-+    /* Immutable pointer, self-locking APIs */
-+    virInhibitor *inhibitor;
- 
-     /* Read-only */
-     bool privileged;
-diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
-index 23a900193e..42cdb6f883 100644
---- a/src/qemu/qemu_conf.h
-+++ b/src/qemu/qemu_conf.h
-@@ -42,6 +42,7 @@
- #include "virfile.h"
- #include "virfilecache.h"
- #include "virfirmware.h"
-+#include "virinhibitor.h"
- 
- #define QEMU_DRIVER_NAME "QEMU"
- 
-@@ -257,16 +258,12 @@ struct _virQEMUDriver {
-     /* Atomic increment only */
-     int lastvmid;
- 
--    /* Atomic inc/dec only */
--    unsigned int nactive;
--
-     /* Immutable values */
-     bool privileged;
-     char *embeddedRoot;
- 
--    /* Immutable pointers. Caller must provide locking */
--    virStateInhibitCallback inhibitCallback;
--    void *inhibitOpaque;
-+    /* Immutable pointer, self-locking APIs */
-+    virInhibitor *inhibitor;
- 
-     /* Immutable pointer, self-locking APIs */
-     virDomainObjList *domains;
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 379f9fb74f..5b911d5221 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -573,9 +573,6 @@ qemuStateInitialize(bool privileged,
-         return VIR_DRV_STATE_INIT_ERROR;
-     }
- 
--    qemu_driver->inhibitCallback = callback;
--    qemu_driver->inhibitOpaque = opaque;
--
-     qemu_driver->privileged = privileged;
-     qemu_driver->hostarch = virArchFromHost();
-     if (root != NULL)
-@@ -675,6 +672,14 @@ qemuStateInitialize(bool privileged,
-         goto error;
-     }
- 
-+    qemu_driver->inhibitor = virInhibitorNew(
-+        VIR_INHIBITOR_WHAT_NONE,
-+        _("Libvirt QEMU"),
-+        _("QEMU/KVM virtual machines are running"),
-+        VIR_INHIBITOR_MODE_DELAY,
-+        callback,
-+        opaque);
-+
-     if ((qemu_driver->lockFD =
-          virPidFileAcquire(cfg->stateDir, "driver", getpid())) < 0)
-         goto error;
-@@ -1065,6 +1070,7 @@ qemuStateCleanup(void)
-     ebtablesContextFree(qemu_driver->ebtables);
-     virObjectUnref(qemu_driver->domains);
-     virObjectUnref(qemu_driver->nbdkitCapsCache);
-+    virInhibitorFree(qemu_driver->inhibitor);
- 
-     if (qemu_driver->lockFD != -1)
-         virPidFileRelease(qemu_driver->config->stateDir, "driver", qemu_driver->lockFD);
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 7285fd5ce9..722e982b9e 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5853,8 +5853,7 @@ qemuProcessInit(virQEMUDriver *driver,
-         qemuDomainSetFakeReboot(vm, false);
-         virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_STARTING_UP);
- 
--        if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback)
--            driver->inhibitCallback(true, driver->inhibitOpaque);
-+        virInhibitorHold(driver->inhibitor);
- 
-         /* Run an early hook to set-up missing devices */
-         if (qemuProcessStartHook(driver, vm,
-@@ -8885,8 +8884,7 @@ void qemuProcessStop(virQEMUDriver *driver,
-     if (priv->eventThread)
-         g_object_unref(g_steal_pointer(&priv->eventThread));
- 
--    if (g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCallback)
--        driver->inhibitCallback(false, driver->inhibitOpaque);
-+    virInhibitorRelease(driver->inhibitor);
- 
-     /* Clear network bandwidth */
-     virDomainClearNetBandwidth(vm->def);
-@@ -9644,8 +9642,7 @@ qemuProcessReconnect(void *opaque)
-             goto error;
-     }
- 
--    if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback)
--        driver->inhibitCallback(true, driver->inhibitOpaque);
-+    virInhibitorHold(driver->inhibitor);
- 
-  cleanup:
-     if (jobStarted)
-diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
-index a2d6b879d0..04c3ca49f1 100644
---- a/src/secret/secret_driver.c
-+++ b/src/secret/secret_driver.c
-@@ -41,6 +41,7 @@
- #include "viraccessapicheck.h"
- #include "secret_event.h"
- #include "virutil.h"
-+#include "virinhibitor.h"
- 
- #define VIR_FROM_THIS VIR_FROM_SECRET
- 
-@@ -67,9 +68,8 @@ struct _virSecretDriverState {
-     /* Immutable pointer, self-locking APIs */
-     virObjectEventState *secretEventState;
- 
--    /* Immutable pointers. Caller must provide locking */
--    virStateInhibitCallback inhibitCallback;
--    void *inhibitOpaque;
-+    /* Immutable pointer, self-locking APIs */
-+    virInhibitor *inhibitor;
- };
- 
- static virSecretDriverState *driver;
-@@ -90,23 +90,6 @@ secretObjFromSecret(virSecretPtr secret)
- }
- 
- 
--static bool
--secretNumOfEphemeralSecretsHelper(virConnectPtr conn G_GNUC_UNUSED,
--                                  virSecretDef *def)
--{
--    return def->isephemeral;
--}
--
--
--static int
--secretNumOfEphemeralSecrets(void)
--{
--    return virSecretObjListNumOfSecrets(driver->secrets,
--                                        secretNumOfEphemeralSecretsHelper,
--                                        NULL);
--}
--
--
- /* Driver functions */
- 
- static int
-@@ -271,6 +254,10 @@ secretDefineXML(virConnectPtr conn,
-                        objDef->uuid,
-                        objDef->usage_type,
-                        objDef->usage_id);
-+
-+    if (objDef->isephemeral)
-+        virInhibitorHold(driver->inhibitor);
-+
-     goto cleanup;
- 
-  restore_backup:
-@@ -288,8 +275,6 @@ secretDefineXML(virConnectPtr conn,
-     virSecretDefFree(def);
-     virSecretObjEndAPI(&obj);
- 
--    if (secretNumOfEphemeralSecrets() > 0)
--        driver->inhibitCallback(true, driver->inhibitOpaque);
- 
-     virObjectEventStateQueue(driver->secretEventState, event);
- 
-@@ -440,6 +425,9 @@ secretUndefine(virSecretPtr secret)
-                                        VIR_SECRET_EVENT_UNDEFINED,
-                                        0);
- 
-+    if (def->isephemeral)
-+        virInhibitorRelease(driver->inhibitor);
-+
-     virSecretObjDeleteData(obj);
- 
-     virSecretObjListRemove(driver->secrets, obj);
-@@ -450,9 +438,6 @@ secretUndefine(virSecretPtr secret)
-  cleanup:
-     virSecretObjEndAPI(&obj);
- 
--    if (secretNumOfEphemeralSecrets() == 0)
--        driver->inhibitCallback(false, driver->inhibitOpaque);
--
-     virObjectEventStateQueue(driver->secretEventState, event);
- 
-     return ret;
-@@ -469,6 +454,7 @@ secretStateCleanupLocked(void)
-     VIR_FREE(driver->configDir);
- 
-     virObjectUnref(driver->secretEventState);
-+    virInhibitorFree(driver->inhibitor);
- 
-     if (driver->lockFD != -1)
-         virPidFileRelease(driver->stateDir, "driver", driver->lockFD);
-@@ -502,8 +488,6 @@ secretStateInitialize(bool privileged,
-     driver->lockFD = -1;
-     driver->secretEventState = virObjectEventStateNew();
-     driver->privileged = privileged;
--    driver->inhibitCallback = callback;
--    driver->inhibitOpaque = opaque;
- 
-     if (root) {
-         driver->embeddedRoot = g_strdup(root);
-@@ -535,6 +519,14 @@ secretStateInitialize(bool privileged,
-         goto error;
-     }
- 
-+    driver->inhibitor = virInhibitorNew(
-+        VIR_INHIBITOR_WHAT_NONE,
-+        _("Libvirt Secret"),
-+        _("Ephemeral secrets are loaded"),
-+        VIR_INHIBITOR_MODE_DELAY,
-+        callback,
-+        opaque);
-+
-     if ((driver->lockFD =
-          virPidFileAcquire(driver->stateDir, "driver", getpid())) < 0)
-         goto error;
--- 
-2.49.0
diff --git a/SOURCES/libvirt-src-introduce-raw-and-rawset-ACPI-table-types.patch b/SOURCES/libvirt-src-introduce-raw-and-rawset-ACPI-table-types.patch
deleted file mode 100644
index 82ab425..0000000
--- a/SOURCES/libvirt-src-introduce-raw-and-rawset-ACPI-table-types.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 27c5b0f2d04b700ef763ae1299143bca638c6d91 Mon Sep 17 00:00:00 2001
-Message-ID: <27c5b0f2d04b700ef763ae1299143bca638c6d91.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 26 Feb 2025 18:39:18 +0000
-Subject: [PATCH] src: introduce 'raw' and 'rawset' ACPI table types
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The QEMU driver has only accepted type=slic even though QEMU is able to
-accept individual tables of any type, without needing to specify a
-signature. Introduce type=raw to address this usage scenario. Contrary
-to other types, this one may appear multiple times.
-
-The Xen driver has mistakenly accepted type=slic and use it to set the
-Xen acpi_firmware setting, which performs a simple passthrough of
-multiple concatenated data table. Introduce type=rawset to address
-this usage scenario.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 513ef8f028e8b0acbad2c38b8db6507bd96484cc)
-Resolves: https://issues.redhat.com/browse/RHEL-81041
----
- docs/formatdomain.rst             | 19 ++++++++++++++++---
- src/conf/domain_conf.c            |  5 ++++-
- src/conf/domain_conf.h            |  2 ++
- src/conf/schemas/domaincommon.rng |  6 +++++-
- src/libxl/libxl_domain.c          |  7 +++++++
- src/qemu/qemu_command.c           |  2 ++
- src/qemu/qemu_validate.c          |  7 +++++++
- 7 files changed, 43 insertions(+), 5 deletions(-)
-
-diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index c077c09a39..b6e162235c 100644
---- a/docs/formatdomain.rst
-+++ b/docs/formatdomain.rst
-@@ -484,9 +484,22 @@ These options apply to any form of booting of the guest OS.
-    ...
- 
- ``acpi``
--   The ``table`` element contains a fully-qualified path to the ACPI table. The
--   ``type`` attribute contains the ACPI table type (currently only ``slic`` is
--   supported) :since:`Since 1.3.5 (QEMU)` :since:`Since 5.9.0 (Xen)`
-+   The ``table`` element contains a fully-qualified path to the ACPI table,
-+   with the ``type`` attribute dictating what data must be present in the
-+   file:
-+
-+   * ``raw``: a single ACPI table with header and data, with ACPI
-+     signature auto-detected from header (:since:`Since 11.2.0`).
-+   * ``rawset``: concatenation of multiple ACPI tables with header
-+     and data, each with any ACPI signature, auto-detected from header
-+     (:since:`Since 11.2.0`).
-+   * ``slic``: a single ACPI table with header and data, providing
-+     software licensing information. The ACPI table signature in the
-+     header will be forced to ``SLIC`` (:since:`Since 1.3.5 (QEMU)`,
-+     mis-interpreted as ``rawset`` :since:`Since 5.9.0 (Xen)`).
-+
-+   Each type may be used only once, except for ``raw`` which can
-+   appear multiple times.
- 
- 
- SMBIOS System Information
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index b0628da279..2ee0403c86 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -1458,6 +1458,8 @@ VIR_ENUM_IMPL(virDomainOsDefFirmwareFeature,
- 
- VIR_ENUM_IMPL(virDomainOsACPITable,
-               VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST,
-+              "raw",
-+              "rawset",
-               "slic",
- );
- 
-@@ -17891,7 +17893,8 @@ virDomainDefParseBootAcpiOptions(virDomainDef *def,
-             goto error;
- 
-         for (j = 0; j < i; j++) {
--            if (tables[j]->type == type) {
-+            if (tables[j]->type == type &&
-+                type != VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW) {
-                 virReportError(VIR_ERR_XML_ERROR,
-                                _("ACPI table type '%1$s' may only appear once"),
-                                virDomainOsACPITableTypeToString(type));
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index f52b80caec..bc3f42888e 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -2463,6 +2463,8 @@ typedef enum {
- VIR_ENUM_DECL(virDomainOsDefFirmwareFeature);
- 
- typedef enum {
-+    VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW,
-+    VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET,
-     VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC,
- 
-     VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST
-diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index d433e95d8b..99bcc90d4f 100644
---- a/src/conf/schemas/domaincommon.rng
-+++ b/src/conf/schemas/domaincommon.rng
-@@ -7188,7 +7188,11 @@
-       <zeroOrMore>
-         <element name="table">
-           <attribute name="type">
--            <value>slic</value>
-+            <choice>
-+              <value>raw</value>
-+              <value>rawset</value>
-+              <value>slic</value>
-+            </choice>
-           </attribute>
-           <ref name="absFilePath"/>
-         </element>
-diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
-index efd01840de..e564d9e5fe 100644
---- a/src/libxl/libxl_domain.c
-+++ b/src/libxl/libxl_domain.c
-@@ -336,6 +336,13 @@ libxlDomainDefValidate(const virDomainDef *def,
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC:
-             break;
- 
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW:
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET:
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                           _("ACPI table type '%1$s' is not supported"),
-+                           virDomainOsACPITableTypeToString(def->os.acpiTables[i]->type));
-+            return -1;
-+
-         default:
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST:
-             virReportEnumRangeError(virDomainOsACPITable,
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 756dd2168b..94fb7fc4c2 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -130,6 +130,8 @@ VIR_ENUM_IMPL(qemuNumaPolicy,
- VIR_ENUM_DECL(qemuACPITableSIG);
- VIR_ENUM_IMPL(qemuACPITableSIG,
-               VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST,
-+              "", /* raw */
-+              "", /* rawset */
-               "SLIC");
- 
- 
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index e500a5d314..8ef0257d73 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -732,6 +732,13 @@ qemuValidateDomainDefBoot(const virDomainDef *def,
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC:
-             break;
- 
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW:
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET:
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                           _("ACPI table type '%1$s' is not supported"),
-+                           virDomainOsACPITableTypeToString(def->os.acpiTables[i]->type));
-+            return -1;
-+
-         default:
-         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST:
-             virReportEnumRangeError(virDomainOsACPITable,
--- 
-2.49.0
diff --git a/SOURCES/libvirt-src-validate-permitted-ACPI-table-types-in-libxl-qemu-drivers.patch b/SOURCES/libvirt-src-validate-permitted-ACPI-table-types-in-libxl-qemu-drivers.patch
deleted file mode 100644
index 971499f..0000000
--- a/SOURCES/libvirt-src-validate-permitted-ACPI-table-types-in-libxl-qemu-drivers.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 39e946bdfdd15667379debea04d91fac43bde541 Mon Sep 17 00:00:00 2001
-Message-ID: <39e946bdfdd15667379debea04d91fac43bde541.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 17 Feb 2025 16:39:29 +0000
-Subject: [PATCH] src: validate permitted ACPI table types in libxl/qemu
- drivers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This forces us to update the drivers when defining new table types
-to avoid incorrectly accepting them by default.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 3d94587655696509f34492f75c2a31a7a93eb2f9)
-Resolves: https://issues.redhat.com/browse/RHEL-81041
----
- src/libxl/libxl_domain.c | 19 +++++++++++++++++++
- src/qemu/qemu_validate.c | 15 +++++++++++++++
- 2 files changed, 34 insertions(+)
-
-diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
-index 6805160923..efd01840de 100644
---- a/src/libxl/libxl_domain.c
-+++ b/src/libxl/libxl_domain.c
-@@ -306,6 +306,7 @@ libxlDomainDefValidate(const virDomainDef *def,
-     libxlDriverPrivate *driver = opaque;
-     g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver);
-     bool reqSecureBoot = false;
-+    size_t i;
- 
-     if (!virCapabilitiesDomainSupported(cfg->caps, def->os.type,
-                                         def->os.arch,
-@@ -330,6 +331,24 @@ libxlDomainDefValidate(const virDomainDef *def,
-         return -1;
-     }
- 
-+    for (i = 0; i < def->os.nacpiTables; i++) {
-+        switch (def->os.acpiTables[i]->type) {
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC:
-+            break;
-+
-+        default:
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST:
-+            virReportEnumRangeError(virDomainOsACPITable,
-+                                    def->os.acpiTables[i]->type);
-+            return -1;
-+        }
-+    }
-+    if (def->os.nacpiTables > 1) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("Only a single ACPI table is supported"));
-+        return -1;
-+    }
-+
-     if (def->nsounds > 0) {
-         virDomainSoundDef *snd = def->sounds[0];
- 
-diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index 289a3f94cc..e500a5d314 100644
---- a/src/qemu/qemu_validate.c
-+++ b/src/qemu/qemu_validate.c
-@@ -686,6 +686,8 @@ static int
- qemuValidateDomainDefBoot(const virDomainDef *def,
-                           virQEMUCaps *qemuCaps)
- {
-+    size_t i;
-+
-     if (def->os.bootloader || def->os.bootloaderArgs) {
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                        _("bootloader is not supported by QEMU"));
-@@ -725,6 +727,19 @@ qemuValidateDomainDefBoot(const virDomainDef *def,
-             return -1;
-     }
- 
-+    for (i = 0; i < def->os.nacpiTables; i++) {
-+        switch (def->os.acpiTables[i]->type) {
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC:
-+            break;
-+
-+        default:
-+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST:
-+            virReportEnumRangeError(virDomainOsACPITable,
-+                                    def->os.acpiTables[i]->type);
-+            return -1;
-+        }
-+    }
-+
-     return 0;
- }
- 
--- 
-2.49.0
diff --git a/SOURCES/libvirt-storage_file-Refuse-qcow2-images-with-empty-string-as-data_file.patch b/SOURCES/libvirt-storage_file-Refuse-qcow2-images-with-empty-string-as-data_file.patch
deleted file mode 100644
index 47ea4bc..0000000
--- a/SOURCES/libvirt-storage_file-Refuse-qcow2-images-with-empty-string-as-data_file.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 45c5f48cef27f4233a4964337d33db78ab51740b Mon Sep 17 00:00:00 2001
-Message-ID: <45c5f48cef27f4233a4964337d33db78ab51740b.1737731143.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 9 Jan 2025 14:53:49 +0100
-Subject: [PATCH] storage_file: Refuse qcow2 images with empty string as
- 'data_file'
-
-In certain buggy conditions qemu can create an image which has empty
-string stored as 'data_file'. While probing libvirt would consider the
-empty string as a relative file name and construct the path using the
-path of the parent image stripping the last component and appending the
-empty string. This results into attempting to using a directory as an
-image and thus the following error when attempting to start VM with such
-an image:
-
- error: unsupported configuration: storage type 'dir' requires use of storage format 'fat'
-
-Reject empty strings passed in as 'data_file'.
-
-Note that we do not have the same problem with 'backing store' as an
-empty string there is interpreted as no backing file both by qemu and
-libvirt.
-
-Resolves: https://issues.redhat.com/browse/RHEL-70627
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 87a4fe2906b712d3a6ea3e9c8d9faa98b9ec5632)
-
-https://issues.redhat.com/browse/RHEL-73504
----
- src/storage_file/storage_source.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/storage_file/storage_source.c b/src/storage_file/storage_source.c
-index 4612e710b0..fa59949cf2 100644
---- a/src/storage_file/storage_source.c
-+++ b/src/storage_file/storage_source.c
-@@ -557,6 +557,16 @@ virStorageSourceNewFromDataFile(virStorageSource *parent)
-     g_autoptr(virStorageSource) dataFile = NULL;
-     int rc;
- 
-+    /* 'qemu-img' records an empty string as 'data_file' field in certain buggy
-+     * cases. Note that it can't happen for 'backing store' as absence of the
-+     * string equals to no backing store. */
-+    if (STREQ(parent->dataFileRaw, "")) {
-+        virReportError(VIR_ERR_OPERATION_FAILED,
-+                       _("invalid empty data-file definition in '%1$s'"),
-+                       NULLSTR(parent->path));
-+        return NULL;
-+    }
-+
-     if ((rc = virStorageSourceNewFromChild(parent,
-                                            parent->dataFileRaw,
-                                            &dataFile)) < 0)
--- 
-2.48.1
diff --git a/SOURCES/libvirt-storage_file-de-modularize-the-local-file-backend.patch b/SOURCES/libvirt-storage_file-de-modularize-the-local-file-backend.patch
deleted file mode 100644
index be8d3c1..0000000
--- a/SOURCES/libvirt-storage_file-de-modularize-the-local-file-backend.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 8baa9e689e641fca914b59e5d27966a1cd925991 Mon Sep 17 00:00:00 2001
-Message-ID: <8baa9e689e641fca914b59e5d27966a1cd925991.1737731143.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 9 Jan 2025 09:52:36 +0100
-Subject: [PATCH] storage_file: de-modularize the local file backend
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The 'storage_file' infrastructure serves as an abstraction on top of
-file-looking storage technologies. Apart from local file it currently
-implements also a backend for 'gluster'.
-
-Historically it was all modularized and the local file module was
-usually packaged with the 'core' part of the storage driver. Now with
-split daemons one can install e.g. 'virqemud' without the storage driver
-core which contains the 'fs' backend module. Since the qemu driver uses
-the storage file backends to e.g. create storage for snapshots and
-backups this allows users to create a deployment where some things will
-not work properly.
-
-As the 'fs' backend doesn't use any code that wouldn't be linked
-directly anyways there's no point in actually shipping it as a module.
-
-Let's compile it in so that all deployments can use it.
-
-To achieve that, compile the source directly into the
-'virt_storage_file_lib' static library and remove the loading code. Also
-adjust the spec file.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit f8558a87ac8525b16f4cbba4f24e0885fde2b79e)
-
-https://issues.redhat.com/browse/RHEL-73507
----
- libvirt.spec.in                         |  1 -
- src/storage_file/meson.build            | 16 ----------------
- src/storage_file/storage_file_backend.c | 11 ++++++-----
- 3 files changed, 6 insertions(+), 22 deletions(-)
-
-diff --git a/src/storage_file/meson.build b/src/storage_file/meson.build
-index d40e98befa..27c4e5a432 100644
---- a/src/storage_file/meson.build
-+++ b/src/storage_file/meson.build
-@@ -3,9 +3,6 @@ storage_file_sources = [
-   'storage_source_backingstore.c',
-   'storage_file_backend.c',
-   'storage_file_probe.c',
--]
--
--stoarge_file_fs_sources = [
-   'storage_file_backend_fs.c',
- ]
- 
-@@ -30,19 +27,6 @@ virt_storage_file_lib = static_library(
- 
- libvirt_libs += virt_storage_file_lib
- 
--if conf.has('WITH_STORAGE')
--  virt_modules += {
--    'name': 'virt_storage_file_fs',
--    'sources': [
--      files(stoarge_file_fs_sources),
--    ],
--    'include': [
--      storage_inc_dir,
--    ],
--    'install_dir': storage_file_install_dir,
--  }
--endif
--
- if conf.has('WITH_STORAGE_GLUSTER')
-   virt_modules += {
-     'name': 'virt_storage_file_gluster',
-diff --git a/src/storage_file/storage_file_backend.c b/src/storage_file/storage_file_backend.c
-index 03583803de..1eeec5fb43 100644
---- a/src/storage_file/storage_file_backend.c
-+++ b/src/storage_file/storage_file_backend.c
-@@ -26,6 +26,7 @@
- #include "virerror.h"
- #include "internal.h"
- #include "storage_file_backend.h"
-+#include "storage_file_backend_fs.h"
- #include "virlog.h"
- #include "virmodule.h"
- #include "virfile.h"
-@@ -40,7 +41,7 @@ VIR_LOG_INIT("storage.storage_source_backend");
- static virStorageFileBackend *virStorageFileBackends[VIR_STORAGE_BACKENDS_MAX];
- static size_t virStorageFileBackendsCount;
- 
--#if WITH_STORAGE_DIR || WITH_STORAGE_FS || WITH_STORAGE_GLUSTER
-+#if WITH_STORAGE_GLUSTER
- 
- # define STORAGE_FILE_MODULE_DIR LIBDIR "/libvirt/storage-file"
- 
-@@ -64,14 +65,14 @@ virStorageFileLoadBackendModule(const char *name,
- 
-     return ret;
- }
--#endif /* WITH_STORAGE_DIR || WITH_STORAGE_FS || WITH_STORAGE_GLUSTER */
-+#endif /* WITH_STORAGE_GLUSTER */
- 
- static int virStorageFileBackendOnceInit(void)
- {
--#if WITH_STORAGE_DIR || WITH_STORAGE_FS
--    if (virStorageFileLoadBackendModule("fs", "virStorageFileFsRegister", false) < 0)
-+    /* The backend for local files is compiled in */
-+    if (virStorageFileFsRegister() < 0)
-         return -1;
--#endif /* WITH_STORAGE_DIR || WITH_STORAGE_FS */
-+
- #if WITH_STORAGE_GLUSTER
-     if (virStorageFileLoadBackendModule("gluster", "virStorageFileGlusterRegister", false) < 0)
-         return -1;
--- 
-2.48.1
diff --git a/SOURCES/libvirt-sync_qemu_models_i386-Generate-missing-v1-variants.patch b/SOURCES/libvirt-sync_qemu_models_i386-Generate-missing-v1-variants.patch
deleted file mode 100644
index 0e6d0e3..0000000
--- a/SOURCES/libvirt-sync_qemu_models_i386-Generate-missing-v1-variants.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0f6f879e8070aca4f61305c7b9099ba8039d6f6d Mon Sep 17 00:00:00 2001
-Message-ID: <0f6f879e8070aca4f61305c7b9099ba8039d6f6d.1734433245.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 28 Nov 2024 13:40:16 +0100
-Subject: [PATCH] sync_qemu_models_i386: Generate missing -v1 variants
-
-QEMU supports -v1 variant of any CPU model even though the list of
-versions is not defined (i.e., even if { .version = 1 } item is
-missing).
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 8bc6ebb495f82ce8edb206eb4d5133e206fd8f2e)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/sync_qemu_models_i386.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py
-index 11fe1f7435..3e14136e07 100755
---- a/src/cpu_map/sync_qemu_models_i386.py
-+++ b/src/cpu_map/sync_qemu_models_i386.py
-@@ -484,6 +484,9 @@ def expand_model(outdir, model):
-     print(result['name'])
-     yield result
- 
-+    if len(versions) == 0:
-+        versions.append({".version": "1"})
-+
-     name = result["name"]
-     for version in versions:
-         result = copy.deepcopy(result)
--- 
-2.47.1
diff --git a/SOURCES/libvirt-sync_qemu_models_i386-Update-meson.build.patch b/SOURCES/libvirt-sync_qemu_models_i386-Update-meson.build.patch
deleted file mode 100644
index d4873de..0000000
--- a/SOURCES/libvirt-sync_qemu_models_i386-Update-meson.build.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 001ca4b5e5405dec8e755d3ab932402552821fb4 Mon Sep 17 00:00:00 2001
-Message-ID: <001ca4b5e5405dec8e755d3ab932402552821fb4.1734433245.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 28 Nov 2024 13:39:29 +0100
-Subject: [PATCH] sync_qemu_models_i386: Update meson.build
-
-When adding new CPU models to CPU map it's easy (and very common) to
-forget to add the new files to meson.build. We already update index.xml
-with the new models so updating meson.build too makes sense.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 19b56603c4d961fc21bfb7516b6ba011dd49f9b2)
-
-https://issues.redhat.com/browse/RHEL-70052
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/sync_qemu_models_i386.py | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py
-index 798d767f4d..11fe1f7435 100755
---- a/src/cpu_map/sync_qemu_models_i386.py
-+++ b/src/cpu_map/sync_qemu_models_i386.py
-@@ -596,6 +596,32 @@ def update_index(outdir, models):
-         f.write("\n")
- 
- 
-+def update_meson(outdir, models):
-+    meson = os.path.join(outdir, "meson.build")
-+
-+    with open(meson, "r") as f:
-+        lines = f.readlines()
-+
-+    start = None
-+    end = None
-+    for i in range(len(lines)):
-+        if start is None and lines[i].startswith("cpumap_data ="):
-+            start = i + 1
-+
-+        if start is not None and lines[i] == "]\n":
-+            end = i
-+            break
-+
-+    xmls = lines[start:end]
-+    for files in models.values():
-+        xmls.extend([f"  '{file}',\n" for file in files])
-+
-+    with open(meson, "w") as f:
-+        f.writelines(lines[:start])
-+        f.writelines(sorted(xmls, key=str.lower))
-+        f.writelines(lines[end:])
-+
-+
- def main():
-     parser = argparse.ArgumentParser(
-         description="Synchronize x86 cpu models from QEMU i386 target.")
-@@ -658,6 +684,7 @@ def main():
-             output_model(f, extra, model)
- 
-     update_index(args.outdir, files)
-+    update_meson(args.outdir, files)
- 
-     features = set()
-     for model in models:
--- 
-2.47.1
diff --git a/SOURCES/libvirt-tests-Test-virFileIsSharedFSOverride.patch b/SOURCES/libvirt-tests-Test-virFileIsSharedFSOverride.patch
new file mode 100644
index 0000000..f13d965
--- /dev/null
+++ b/SOURCES/libvirt-tests-Test-virFileIsSharedFSOverride.patch
@@ -0,0 +1,111 @@
+From b630429647207ba0d406cf855e590ddaa98fdb9b Mon Sep 17 00:00:00 2001
+Message-ID: <b630429647207ba0d406cf855e590ddaa98fdb9b.1766070256.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 5 Dec 2025 15:09:15 +0100
+Subject: [PATCH] tests: Test virFileIsSharedFSOverride
+
+Technically virFileIsSharedFSOverride is available on any OS, but we
+need a mocked realpath() to test it. Because the virfilemock library
+also mocks statfs() which is only available on Linux, we don't even try
+to load the library anywhere else. Thus we need to skip testing
+virFileIsSharedFSOverride on non-Linux too.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 121d179e068b584f62ea2c029d89a44e67c909c0)
+
+https://issues.redhat.com/browse/RHEL-135287
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ tests/virfiletest.c | 69 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 69 insertions(+)
+
+diff --git a/tests/virfiletest.c b/tests/virfiletest.c
+index e05925a321..ccd76a3fac 100644
+--- a/tests/virfiletest.c
++++ b/tests/virfiletest.c
+@@ -329,6 +329,55 @@ testFileIsSharedFSType(const void *opaque G_GNUC_UNUSED)
+ }
+ 
+ 
++static const char *shared_filesystems[] = {
++    "/run/user/501/gvfs",
++    "/nfs",
++    "/gluster",
++    "/ceph/multi",
++    "/gpfs/data/blaf",
++    "/quobyte",
++    NULL,
++};
++
++static int
++testFileIsSharedFSOverride(const void *opaque G_GNUC_UNUSED)
++{
++#ifndef __linux__
++    return EXIT_AM_SKIP;
++#else
++    const struct testFileIsSharedFSType *data = opaque;
++    g_autofree char *mtabFile = NULL;
++    bool actual;
++    int ret = -1;
++
++    /* mtab is used by mocked realpath to decide whether a given path exists */
++    mtabFile = g_strdup_printf(abs_srcdir "/virfiledata/%s", data->mtabFile);
++
++    if (!g_setenv("LIBVIRT_MTAB", mtabFile, true)) {
++        fprintf(stderr, "Unable to set env variable\n");
++        goto cleanup;
++    }
++
++    actual = virFileIsSharedFSOverride(data->filename,
++                                       (char * const *) shared_filesystems);
++
++    if (actual != data->expected) {
++        fprintf(stderr, "FS of '%s' is %s. Expected: %s\n",
++                data->filename,
++                actual ? "shared" : "not shared",
++                data->expected ? "shared" : "not shared");
++        goto cleanup;
++    }
++
++    ret = 0;
++
++ cleanup:
++    g_unsetenv("LIBVIRT_MTAB");
++    return ret;
++#endif
++}
++
++
+ static int
+ mymain(void)
+ {
+@@ -439,6 +488,26 @@ mymain(void)
+     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gpfs/data", true);
+     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/quobyte", true);
+ 
++#define DO_TEST_FILE_IS_SHARED_FS_OVERRIDE(mtab, file, exp) \
++    do { \
++        struct testFileIsSharedFSType data = { \
++            .mtabFile = mtab, .filename = file, .expected = exp \
++        }; \
++        if (virTestRun(virTestCounterNext(), testFileIsSharedFSOverride, &data) < 0) \
++            ret = -1; \
++    } while (0)
++
++    virTestCounterReset("testFileIsSharedFSOverride ");
++    DO_TEST_FILE_IS_SHARED_FS_OVERRIDE("mounts2.txt", "/boot/vmlinuz", false);
++    DO_TEST_FILE_IS_SHARED_FS_OVERRIDE("mounts2.txt", "/run/user/501/gvfs/some/file", true);
++    DO_TEST_FILE_IS_SHARED_FS_OVERRIDE("mounts3.txt", "/nfs/file", true);
++    DO_TEST_FILE_IS_SHARED_FS_OVERRIDE("mounts3.txt", "/gluster/file", true);
++    DO_TEST_FILE_IS_SHARED_FS_OVERRIDE("mounts3.txt", "/some/symlink/file", true);
++    DO_TEST_FILE_IS_SHARED_FS_OVERRIDE("mounts3.txt", "/ceph/file", false);
++    DO_TEST_FILE_IS_SHARED_FS_OVERRIDE("mounts3.txt", "/ceph/multi/file", true);
++    DO_TEST_FILE_IS_SHARED_FS_OVERRIDE("mounts3.txt", "/gpfs/data", false);
++    DO_TEST_FILE_IS_SHARED_FS_OVERRIDE("mounts3.txt", "/quobyte", true);
++
+     return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ }
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-tests-add-capabilities-for-QEMU-10.0.0-on-s390x.patch b/SOURCES/libvirt-tests-add-capabilities-for-QEMU-10.0.0-on-s390x.patch
deleted file mode 100644
index 8a32d61..0000000
--- a/SOURCES/libvirt-tests-add-capabilities-for-QEMU-10.0.0-on-s390x.patch
+++ /dev/null
@@ -1,42185 +0,0 @@
-From dd7b0824364c77576bc8b828c75b0362ec8f3873 Mon Sep 17 00:00:00 2001
-Message-ID: <dd7b0824364c77576bc8b828c75b0362ec8f3873.1744876588.git.jdenemar@redhat.com>
-From: Shalini Chellathurai Saroja <shalini@linux.ibm.com>
-Date: Tue, 21 Jan 2025 14:51:28 +0100
-Subject: [PATCH] tests: add capabilities for QEMU 10.0.0 on s390x
-
-Let us introduce the xml and reply files for QEMU 10.0.0 on s390x.
-
-Notable changes:
-    - new s390-ccw-virtio-10.0 machine type
-    - old machine types (2.4 - 2.8) dropped
-    - new CPU models
-    - New devices:
-      - virtio-mem-ccw
-      - chardev now supports qemu-vdagent
-
-Signed-off-by: Shalini Chellathurai Saroja <shalini@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Suggested-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 652b2eeaa91ebde76b951593e4f77ec3cf6fcc46)
-
-There's a difference to the original commit. Most notably:
-
-1) The "query-cpu-model-expansion" QMP command is issued one time
-   less than in upstream. This is because in upstream it's linked
-   to "query-cpu-model-expansion.deprecated-props" capability and
-   it isn't backported downstream. See the following upstream
-   commit for more info: v11.0.0-rc1~74.
-
-2) The resulting capabilities XML lacks
-   "migrate-incoming.exit-on-error" capability as it isn't
-   backported yet. Upstream commit: v11.0.0-rc1~65.
-
-Resolves: https://issues.redhat.com/browse/RHEL-72976
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- tests/domaincapsdata/qemu_10.0.0.s390x.xml    |   359 +
- .../caps_10.0.0_s390x.replies                 | 37559 ++++++++++++++++
- .../caps_10.0.0_s390x.xml                     |  4202 ++
- 3 files changed, 42120 insertions(+)
- create mode 100644 tests/domaincapsdata/qemu_10.0.0.s390x.xml
- create mode 100644 tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
- create mode 100644 tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
-
-diff --git a/tests/domaincapsdata/qemu_10.0.0.s390x.xml b/tests/domaincapsdata/qemu_10.0.0.s390x.xml
-new file mode 100644
-index 0000000000..4af3c7ec53
---- /dev/null
-+++ b/tests/domaincapsdata/qemu_10.0.0.s390x.xml
-@@ -0,0 +1,359 @@
-+<domainCapabilities>
-+  <path>/usr/bin/qemu-system-s390x</path>
-+  <domain>kvm</domain>
-+  <machine>s390-ccw-virtio-10.0</machine>
-+  <arch>s390x</arch>
-+  <vcpu max='248'/>
-+  <iothreads supported='yes'/>
-+  <os supported='yes'>
-+    <enum name='firmware'/>
-+    <loader supported='yes'>
-+      <value>/obviously/fake/firmware1.fd</value>
-+      <value>/obviously/fake/firmware2.fd</value>
-+      <enum name='type'>
-+        <value>rom</value>
-+        <value>pflash</value>
-+      </enum>
-+      <enum name='readonly'>
-+        <value>yes</value>
-+        <value>no</value>
-+      </enum>
-+      <enum name='secure'>
-+        <value>no</value>
-+      </enum>
-+    </loader>
-+  </os>
-+  <cpu>
-+    <mode name='host-passthrough' supported='yes'>
-+      <enum name='hostPassthroughMigratable'>
-+        <value>off</value>
-+      </enum>
-+    </mode>
-+    <mode name='maximum' supported='yes'>
-+      <enum name='maximumMigratable'>
-+        <value>on</value>
-+        <value>off</value>
-+      </enum>
-+    </mode>
-+    <mode name='host-model' supported='yes'>
-+      <model fallback='forbid'>gen16a-base</model>
-+      <feature policy='require' name='nnpa'/>
-+      <feature policy='require' name='aen'/>
-+      <feature policy='require' name='cmmnt'/>
-+      <feature policy='require' name='vxpdeh'/>
-+      <feature policy='require' name='aefsi'/>
-+      <feature policy='require' name='diag318'/>
-+      <feature policy='require' name='csske'/>
-+      <feature policy='require' name='mepoch'/>
-+      <feature policy='require' name='msa9'/>
-+      <feature policy='require' name='msa8'/>
-+      <feature policy='require' name='msa7'/>
-+      <feature policy='require' name='msa6'/>
-+      <feature policy='require' name='msa5'/>
-+      <feature policy='require' name='msa4'/>
-+      <feature policy='require' name='msa3'/>
-+      <feature policy='require' name='msa2'/>
-+      <feature policy='require' name='msa1'/>
-+      <feature policy='require' name='sthyi'/>
-+      <feature policy='require' name='edat'/>
-+      <feature policy='require' name='ri'/>
-+      <feature policy='require' name='deflate'/>
-+      <feature policy='require' name='edat2'/>
-+      <feature policy='require' name='etoken'/>
-+      <feature policy='require' name='vx'/>
-+      <feature policy='require' name='ipter'/>
-+      <feature policy='require' name='pai'/>
-+      <feature policy='require' name='paie'/>
-+      <feature policy='require' name='mepochptff'/>
-+      <feature policy='require' name='ap'/>
-+      <feature policy='require' name='vxeh'/>
-+      <feature policy='require' name='vxpd'/>
-+      <feature policy='require' name='esop'/>
-+      <feature policy='require' name='msa9_pckmo'/>
-+      <feature policy='require' name='vxeh2'/>
-+      <feature policy='require' name='esort'/>
-+      <feature policy='require' name='appv'/>
-+      <feature policy='require' name='apqi'/>
-+      <feature policy='require' name='apft'/>
-+      <feature policy='require' name='els'/>
-+      <feature policy='require' name='iep'/>
-+      <feature policy='require' name='appvi'/>
-+      <feature policy='require' name='apqci'/>
-+      <feature policy='require' name='cte'/>
-+      <feature policy='require' name='ais'/>
-+      <feature policy='require' name='bpb'/>
-+      <feature policy='require' name='ctop'/>
-+      <feature policy='require' name='gs'/>
-+      <feature policy='require' name='ppa15'/>
-+      <feature policy='require' name='zpci'/>
-+      <feature policy='require' name='rdp'/>
-+      <feature policy='require' name='sea_esop2'/>
-+      <feature policy='require' name='beareh'/>
-+      <feature policy='require' name='te'/>
-+      <feature policy='require' name='cmm'/>
-+      <feature policy='require' name='vxpdeh2'/>
-+    </mode>
-+    <mode name='custom' supported='yes'>
-+      <model usable='yes' vendor='IBM'>gen15a</model>
-+      <model usable='yes' vendor='IBM'>gen15a-base</model>
-+      <model usable='yes' vendor='IBM'>gen15b</model>
-+      <model usable='yes' vendor='IBM'>gen15b-base</model>
-+      <model usable='yes' vendor='IBM'>gen16a</model>
-+      <model usable='yes' vendor='IBM'>gen16a-base</model>
-+      <model usable='yes' vendor='IBM'>gen16b</model>
-+      <model usable='yes' vendor='IBM'>gen16b-base</model>
-+      <model usable='no' vendor='IBM'>gen17a</model>
-+      <blockers model='gen17a'>
-+        <feature name='minste4'/>
-+        <feature name='msa10'/>
-+        <feature name='msa10_pckmo'/>
-+        <feature name='msa11'/>
-+        <feature name='msa11_pckmo'/>
-+        <feature name='msa12'/>
-+        <feature name='msa13'/>
-+        <feature name='msa13_pckmo'/>
-+        <feature name='plo_ext'/>
-+        <feature name='sif'/>
-+        <feature name='type'/>
-+        <feature name='vxeh3'/>
-+        <feature name='vxpdeh3'/>
-+      </blockers>
-+      <model usable='no' vendor='IBM'>gen17a-base</model>
-+      <blockers model='gen17a-base'>
-+        <feature name='minste4'/>
-+        <feature name='msa12'/>
-+        <feature name='plo_ext'/>
-+        <feature name='sif'/>
-+        <feature name='type'/>
-+      </blockers>
-+      <model usable='no' vendor='IBM'>gen17b</model>
-+      <blockers model='gen17b'>
-+        <feature name='minste4'/>
-+        <feature name='msa10'/>
-+        <feature name='msa10_pckmo'/>
-+        <feature name='msa11'/>
-+        <feature name='msa11_pckmo'/>
-+        <feature name='msa12'/>
-+        <feature name='msa13'/>
-+        <feature name='msa13_pckmo'/>
-+        <feature name='plo_ext'/>
-+        <feature name='sif'/>
-+        <feature name='type'/>
-+        <feature name='vxeh3'/>
-+        <feature name='vxpdeh3'/>
-+      </blockers>
-+      <model usable='no' vendor='IBM'>gen17b-base</model>
-+      <blockers model='gen17b-base'>
-+        <feature name='minste4'/>
-+        <feature name='msa12'/>
-+        <feature name='plo_ext'/>
-+        <feature name='sif'/>
-+        <feature name='type'/>
-+      </blockers>
-+      <model usable='yes' vendor='unknown'>max</model>
-+      <model usable='yes' vendor='unknown'>qemu</model>
-+      <model usable='yes' vendor='IBM'>z10BC</model>
-+      <model usable='yes' vendor='IBM'>z10BC-base</model>
-+      <model usable='yes' vendor='IBM'>z10BC.2</model>
-+      <model usable='yes' vendor='IBM'>z10BC.2-base</model>
-+      <model usable='yes' vendor='IBM'>z10EC</model>
-+      <model usable='yes' vendor='IBM'>z10EC-base</model>
-+      <model usable='yes' vendor='IBM'>z10EC.2</model>
-+      <model usable='yes' vendor='IBM'>z10EC.2-base</model>
-+      <model usable='yes' vendor='IBM'>z10EC.3</model>
-+      <model usable='yes' vendor='IBM'>z10EC.3-base</model>
-+      <model usable='yes' vendor='IBM'>z114</model>
-+      <model usable='yes' vendor='IBM'>z114-base</model>
-+      <model usable='yes' vendor='IBM'>z13</model>
-+      <model usable='yes' vendor='IBM'>z13-base</model>
-+      <model usable='yes' vendor='IBM'>z13.2</model>
-+      <model usable='yes' vendor='IBM'>z13.2-base</model>
-+      <model usable='yes' vendor='IBM'>z13s</model>
-+      <model usable='yes' vendor='IBM'>z13s-base</model>
-+      <model usable='yes' vendor='IBM'>z14</model>
-+      <model usable='yes' vendor='IBM'>z14-base</model>
-+      <model usable='yes' vendor='IBM'>z14.2</model>
-+      <model usable='yes' vendor='IBM'>z14.2-base</model>
-+      <model usable='yes' vendor='IBM'>z14ZR1</model>
-+      <model usable='yes' vendor='IBM'>z14ZR1-base</model>
-+      <model usable='yes' vendor='IBM'>z196</model>
-+      <model usable='yes' vendor='IBM'>z196-base</model>
-+      <model usable='yes' vendor='IBM'>z196.2</model>
-+      <model usable='yes' vendor='IBM'>z196.2-base</model>
-+      <model usable='yes' vendor='IBM'>z800</model>
-+      <model usable='yes' vendor='IBM'>z800-base</model>
-+      <model usable='yes' vendor='IBM'>z890</model>
-+      <model usable='yes' vendor='IBM'>z890-base</model>
-+      <model usable='yes' vendor='IBM'>z890.2</model>
-+      <model usable='yes' vendor='IBM'>z890.2-base</model>
-+      <model usable='yes' vendor='IBM'>z890.3</model>
-+      <model usable='yes' vendor='IBM'>z890.3-base</model>
-+      <model usable='yes' vendor='IBM'>z900</model>
-+      <model usable='yes' vendor='IBM'>z900-base</model>
-+      <model usable='yes' vendor='IBM'>z900.2</model>
-+      <model usable='yes' vendor='IBM'>z900.2-base</model>
-+      <model usable='yes' vendor='IBM'>z900.3</model>
-+      <model usable='yes' vendor='IBM'>z900.3-base</model>
-+      <model usable='yes' vendor='IBM'>z990</model>
-+      <model usable='yes' vendor='IBM'>z990-base</model>
-+      <model usable='yes' vendor='IBM'>z990.2</model>
-+      <model usable='yes' vendor='IBM'>z990.2-base</model>
-+      <model usable='yes' vendor='IBM'>z990.3</model>
-+      <model usable='yes' vendor='IBM'>z990.3-base</model>
-+      <model usable='yes' vendor='IBM'>z990.4</model>
-+      <model usable='yes' vendor='IBM'>z990.4-base</model>
-+      <model usable='yes' vendor='IBM'>z990.5</model>
-+      <model usable='yes' vendor='IBM'>z990.5-base</model>
-+      <model usable='yes' vendor='IBM'>z9BC</model>
-+      <model usable='yes' vendor='IBM'>z9BC-base</model>
-+      <model usable='yes' vendor='IBM'>z9BC.2</model>
-+      <model usable='yes' vendor='IBM'>z9BC.2-base</model>
-+      <model usable='yes' vendor='IBM'>z9EC</model>
-+      <model usable='yes' vendor='IBM'>z9EC-base</model>
-+      <model usable='yes' vendor='IBM'>z9EC.2</model>
-+      <model usable='yes' vendor='IBM'>z9EC.2-base</model>
-+      <model usable='yes' vendor='IBM'>z9EC.3</model>
-+      <model usable='yes' vendor='IBM'>z9EC.3-base</model>
-+      <model usable='yes' vendor='IBM'>zBC12</model>
-+      <model usable='yes' vendor='IBM'>zBC12-base</model>
-+      <model usable='yes' vendor='IBM'>zEC12</model>
-+      <model usable='yes' vendor='IBM'>zEC12-base</model>
-+      <model usable='yes' vendor='IBM'>zEC12.2</model>
-+      <model usable='yes' vendor='IBM'>zEC12.2-base</model>
-+    </mode>
-+  </cpu>
-+  <memoryBacking supported='yes'>
-+    <enum name='sourceType'>
-+      <value>file</value>
-+      <value>anonymous</value>
-+      <value>memfd</value>
-+    </enum>
-+  </memoryBacking>
-+  <devices>
-+    <disk supported='yes'>
-+      <enum name='diskDevice'>
-+        <value>disk</value>
-+        <value>cdrom</value>
-+        <value>floppy</value>
-+        <value>lun</value>
-+      </enum>
-+      <enum name='bus'>
-+        <value>fdc</value>
-+        <value>scsi</value>
-+        <value>virtio</value>
-+        <value>usb</value>
-+      </enum>
-+      <enum name='model'>
-+        <value>virtio</value>
-+        <value>virtio-transitional</value>
-+        <value>virtio-non-transitional</value>
-+      </enum>
-+    </disk>
-+    <graphics supported='yes'>
-+      <enum name='type'>
-+        <value>sdl</value>
-+        <value>vnc</value>
-+        <value>egl-headless</value>
-+        <value>dbus</value>
-+      </enum>
-+    </graphics>
-+    <video supported='yes'>
-+      <enum name='modelType'>
-+        <value>virtio</value>
-+        <value>none</value>
-+      </enum>
-+    </video>
-+    <hostdev supported='yes'>
-+      <enum name='mode'>
-+        <value>subsystem</value>
-+      </enum>
-+      <enum name='startupPolicy'>
-+        <value>default</value>
-+        <value>mandatory</value>
-+        <value>requisite</value>
-+        <value>optional</value>
-+      </enum>
-+      <enum name='subsysType'>
-+        <value>usb</value>
-+        <value>pci</value>
-+        <value>scsi</value>
-+      </enum>
-+      <enum name='capsType'/>
-+      <enum name='pciBackend'>
-+        <value>default</value>
-+        <value>vfio</value>
-+      </enum>
-+    </hostdev>
-+    <rng supported='yes'>
-+      <enum name='model'>
-+        <value>virtio</value>
-+        <value>virtio-transitional</value>
-+        <value>virtio-non-transitional</value>
-+      </enum>
-+      <enum name='backendModel'>
-+        <value>random</value>
-+        <value>egd</value>
-+        <value>builtin</value>
-+      </enum>
-+    </rng>
-+    <filesystem supported='yes'>
-+      <enum name='driverType'>
-+        <value>path</value>
-+        <value>handle</value>
-+        <value>virtiofs</value>
-+      </enum>
-+    </filesystem>
-+    <tpm supported='no'/>
-+    <redirdev supported='yes'>
-+      <enum name='bus'>
-+        <value>usb</value>
-+      </enum>
-+    </redirdev>
-+    <channel supported='yes'>
-+      <enum name='type'>
-+        <value>pty</value>
-+        <value>unix</value>
-+      </enum>
-+    </channel>
-+    <crypto supported='yes'>
-+      <enum name='model'>
-+        <value>virtio</value>
-+      </enum>
-+      <enum name='type'>
-+        <value>qemu</value>
-+      </enum>
-+      <enum name='backendModel'>
-+        <value>builtin</value>
-+        <value>lkcf</value>
-+      </enum>
-+    </crypto>
-+    <interface supported='yes'>
-+      <enum name='backendType'>
-+        <value>default</value>
-+        <value>passt</value>
-+      </enum>
-+    </interface>
-+    <panic supported='yes'>
-+      <enum name='model'>
-+        <value>s390</value>
-+      </enum>
-+    </panic>
-+  </devices>
-+  <features>
-+    <gic supported='no'/>
-+    <vmcoreinfo supported='no'/>
-+    <genid supported='no'/>
-+    <backingStoreInput supported='yes'/>
-+    <backup supported='yes'/>
-+    <async-teardown supported='yes'/>
-+    <s390-pv supported='yes'/>
-+    <ps2 supported='no'/>
-+    <sev supported='no'/>
-+    <sgx supported='no'/>
-+    <launchSecurity supported='yes'>
-+      <enum name='sectype'>
-+        <value>s390-pv</value>
-+      </enum>
-+    </launchSecurity>
-+  </features>
-+</domainCapabilities>
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
-new file mode 100644
-index 0000000000..05b13b2d2b
---- /dev/null
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies
-@@ -0,0 +1,37559 @@
-+{
-+  "execute": "qmp_capabilities",
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "return": {},
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "execute": "query-version",
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "return": {
-+    "qemu": {
-+      "micro": 50,
-+      "minor": 2,
-+      "major": 9
-+    },
-+    "package": "v9.2.0-1203-gd6430c17d7"
-+  },
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "execute": "query-target",
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "return": {
-+    "arch": "s390x"
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "execute": "query-qmp-schema",
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "query-status",
-+      "ret-type": "1",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "SHUTDOWN",
-+      "meta-type": "event",
-+      "arg-type": "2"
-+    },
-+    {
-+      "name": "POWERDOWN",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "RESET",
-+      "meta-type": "event",
-+      "arg-type": "3"
-+    },
-+    {
-+      "name": "STOP",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "RESUME",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "SUSPEND",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "SUSPEND_DISK",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "WAKEUP",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "WATCHDOG",
-+      "meta-type": "event",
-+      "arg-type": "4"
-+    },
-+    {
-+      "name": "watchdog-set-action",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "5"
-+    },
-+    {
-+      "name": "set-action",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "6"
-+    },
-+    {
-+      "name": "GUEST_PANICKED",
-+      "meta-type": "event",
-+      "arg-type": "7"
-+    },
-+    {
-+      "name": "GUEST_CRASHLOADED",
-+      "meta-type": "event",
-+      "arg-type": "8"
-+    },
-+    {
-+      "name": "GUEST_PVSHUTDOWN",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "MEMORY_FAILURE",
-+      "meta-type": "event",
-+      "arg-type": "9"
-+    },
-+    {
-+      "name": "JOB_STATUS_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "10"
-+    },
-+    {
-+      "name": "job-pause",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "11"
-+    },
-+    {
-+      "name": "job-resume",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "12"
-+    },
-+    {
-+      "name": "job-cancel",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "13"
-+    },
-+    {
-+      "name": "job-complete",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "14"
-+    },
-+    {
-+      "name": "job-dismiss",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "15"
-+    },
-+    {
-+      "name": "job-finalize",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "16"
-+    },
-+    {
-+      "name": "query-jobs",
-+      "ret-type": "[17]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-pr-managers",
-+      "ret-type": "[18]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "eject",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "19"
-+    },
-+    {
-+      "name": "blockdev-open-tray",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "20"
-+    },
-+    {
-+      "name": "blockdev-close-tray",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "21"
-+    },
-+    {
-+      "name": "blockdev-remove-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "22"
-+    },
-+    {
-+      "name": "blockdev-insert-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "23"
-+    },
-+    {
-+      "name": "blockdev-change-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "24"
-+    },
-+    {
-+      "name": "DEVICE_TRAY_MOVED",
-+      "meta-type": "event",
-+      "arg-type": "25"
-+    },
-+    {
-+      "name": "PR_MANAGER_STATUS_CHANGED",
-+      "meta-type": "event",
-+      "arg-type": "26"
-+    },
-+    {
-+      "name": "block_set_io_throttle",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "27"
-+    },
-+    {
-+      "name": "block-latency-histogram-set",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "28"
-+    },
-+    {
-+      "name": "query-block",
-+      "ret-type": "[29]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-blockstats",
-+      "ret-type": "[31]",
-+      "meta-type": "command",
-+      "arg-type": "30"
-+    },
-+    {
-+      "name": "query-block-jobs",
-+      "ret-type": "[32]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "block_resize",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "33"
-+    },
-+    {
-+      "name": "blockdev-snapshot-sync",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "34"
-+    },
-+    {
-+      "name": "blockdev-snapshot",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "35",
-+      "features": [
-+        "allow-write-only-overlay"
-+      ]
-+    },
-+    {
-+      "name": "change-backing-file",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "36"
-+    },
-+    {
-+      "name": "block-commit",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "37"
-+    },
-+    {
-+      "name": "drive-backup",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "38",
-+      "features": [
-+        "deprecated"
-+      ]
-+    },
-+    {
-+      "name": "blockdev-backup",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "39"
-+    },
-+    {
-+      "name": "query-named-block-nodes",
-+      "ret-type": "[41]",
-+      "meta-type": "command",
-+      "arg-type": "40"
-+    },
-+    {
-+      "name": "x-debug-query-block-graph",
-+      "ret-type": "42",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "drive-mirror",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "43"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "44"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-remove",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "45"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-clear",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "45"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-enable",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "45"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-disable",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "45"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-merge",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "46"
-+    },
-+    {
-+      "name": "x-debug-block-dirty-bitmap-sha256",
-+      "ret-type": "47",
-+      "meta-type": "command",
-+      "arg-type": "45",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "blockdev-mirror",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "48"
-+    },
-+    {
-+      "name": "block-stream",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "49"
-+    },
-+    {
-+      "name": "block-job-set-speed",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "50"
-+    },
-+    {
-+      "name": "block-job-cancel",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "51"
-+    },
-+    {
-+      "name": "block-job-pause",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "52"
-+    },
-+    {
-+      "name": "block-job-resume",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "53"
-+    },
-+    {
-+      "name": "block-job-complete",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "54"
-+    },
-+    {
-+      "name": "block-job-dismiss",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "55"
-+    },
-+    {
-+      "name": "block-job-finalize",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "56"
-+    },
-+    {
-+      "name": "block-job-change",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "57"
-+    },
-+    {
-+      "name": "blockdev-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "58"
-+    },
-+    {
-+      "name": "blockdev-reopen",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "59"
-+    },
-+    {
-+      "name": "blockdev-del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "60"
-+    },
-+    {
-+      "name": "blockdev-create",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "61"
-+    },
-+    {
-+      "name": "x-blockdev-amend",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "62",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "BLOCK_IMAGE_CORRUPTED",
-+      "meta-type": "event",
-+      "arg-type": "63"
-+    },
-+    {
-+      "name": "BLOCK_IO_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "64"
-+    },
-+    {
-+      "name": "BLOCK_JOB_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "65"
-+    },
-+    {
-+      "name": "BLOCK_JOB_CANCELLED",
-+      "meta-type": "event",
-+      "arg-type": "66"
-+    },
-+    {
-+      "name": "BLOCK_JOB_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "67"
-+    },
-+    {
-+      "name": "BLOCK_JOB_READY",
-+      "meta-type": "event",
-+      "arg-type": "68"
-+    },
-+    {
-+      "name": "BLOCK_JOB_PENDING",
-+      "meta-type": "event",
-+      "arg-type": "69"
-+    },
-+    {
-+      "name": "BLOCK_WRITE_THRESHOLD",
-+      "meta-type": "event",
-+      "arg-type": "70"
-+    },
-+    {
-+      "name": "block-set-write-threshold",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "71"
-+    },
-+    {
-+      "name": "x-blockdev-change",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "72",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-blockdev-set-iothread",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "73",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "QUORUM_FAILURE",
-+      "meta-type": "event",
-+      "arg-type": "74"
-+    },
-+    {
-+      "name": "QUORUM_REPORT_BAD",
-+      "meta-type": "event",
-+      "arg-type": "75"
-+    },
-+    {
-+      "name": "blockdev-snapshot-internal-sync",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "76"
-+    },
-+    {
-+      "name": "blockdev-snapshot-delete-internal-sync",
-+      "ret-type": "78",
-+      "meta-type": "command",
-+      "arg-type": "77"
-+    },
-+    {
-+      "name": "nbd-server-start",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "79"
-+    },
-+    {
-+      "name": "nbd-server-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "80",
-+      "features": [
-+        "deprecated"
-+      ]
-+    },
-+    {
-+      "name": "nbd-server-remove",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "81",
-+      "features": [
-+        "deprecated"
-+      ]
-+    },
-+    {
-+      "name": "nbd-server-stop",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "block-export-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "82"
-+    },
-+    {
-+      "name": "block-export-del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "83"
-+    },
-+    {
-+      "name": "BLOCK_EXPORT_DELETED",
-+      "meta-type": "event",
-+      "arg-type": "84"
-+    },
-+    {
-+      "name": "query-block-exports",
-+      "ret-type": "[85]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-chardev",
-+      "ret-type": "[86]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-chardev-backends",
-+      "ret-type": "[87]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "ringbuf-write",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "88"
-+    },
-+    {
-+      "name": "ringbuf-read",
-+      "ret-type": "str",
-+      "meta-type": "command",
-+      "arg-type": "89"
-+    },
-+    {
-+      "name": "chardev-add",
-+      "ret-type": "91",
-+      "meta-type": "command",
-+      "arg-type": "90"
-+    },
-+    {
-+      "name": "chardev-change",
-+      "ret-type": "91",
-+      "meta-type": "command",
-+      "arg-type": "92"
-+    },
-+    {
-+      "name": "chardev-remove",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "93"
-+    },
-+    {
-+      "name": "chardev-send-break",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "94"
-+    },
-+    {
-+      "name": "VSERPORT_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "95"
-+    },
-+    {
-+      "name": "dump-guest-memory",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "96"
-+    },
-+    {
-+      "name": "query-dump",
-+      "ret-type": "97",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "DUMP_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "98"
-+    },
-+    {
-+      "name": "query-dump-guest-memory-capability",
-+      "ret-type": "99",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "set_link",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "100"
-+    },
-+    {
-+      "name": "netdev_add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "101"
-+    },
-+    {
-+      "name": "netdev_del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "102"
-+    },
-+    {
-+      "name": "query-rx-filter",
-+      "ret-type": "[104]",
-+      "meta-type": "command",
-+      "arg-type": "103"
-+    },
-+    {
-+      "name": "NIC_RX_FILTER_CHANGED",
-+      "meta-type": "event",
-+      "arg-type": "105"
-+    },
-+    {
-+      "name": "announce-self",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "106"
-+    },
-+    {
-+      "name": "FAILOVER_NEGOTIATED",
-+      "meta-type": "event",
-+      "arg-type": "107"
-+    },
-+    {
-+      "name": "NETDEV_STREAM_CONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "108"
-+    },
-+    {
-+      "name": "NETDEV_STREAM_DISCONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "109"
-+    },
-+    {
-+      "name": "request-ebpf",
-+      "ret-type": "111",
-+      "meta-type": "command",
-+      "arg-type": "110"
-+    },
-+    {
-+      "name": "query-rocker",
-+      "ret-type": "113",
-+      "meta-type": "command",
-+      "arg-type": "112"
-+    },
-+    {
-+      "name": "query-rocker-ports",
-+      "ret-type": "[115]",
-+      "meta-type": "command",
-+      "arg-type": "114"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-flows",
-+      "ret-type": "[117]",
-+      "meta-type": "command",
-+      "arg-type": "116"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-groups",
-+      "ret-type": "[119]",
-+      "meta-type": "command",
-+      "arg-type": "118"
-+    },
-+    {
-+      "name": "query-tpm-models",
-+      "ret-type": "[120]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-tpm-types",
-+      "ret-type": "[121]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-tpm",
-+      "ret-type": "[122]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "set_password",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "123"
-+    },
-+    {
-+      "name": "expire_password",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "124"
-+    },
-+    {
-+      "name": "screendump",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "125"
-+    },
-+    {
-+      "name": "query-vnc",
-+      "ret-type": "130",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-vnc-servers",
-+      "ret-type": "[131]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "change-vnc-password",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "132"
-+    },
-+    {
-+      "name": "VNC_CONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "133"
-+    },
-+    {
-+      "name": "VNC_INITIALIZED",
-+      "meta-type": "event",
-+      "arg-type": "134"
-+    },
-+    {
-+      "name": "VNC_DISCONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "135"
-+    },
-+    {
-+      "name": "query-mice",
-+      "ret-type": "[136]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "send-key",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "137"
-+    },
-+    {
-+      "name": "input-send-event",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "138"
-+    },
-+    {
-+      "name": "query-display-options",
-+      "ret-type": "139",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "display-reload",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "140"
-+    },
-+    {
-+      "name": "display-update",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "141"
-+    },
-+    {
-+      "name": "client_migrate_info",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "142"
-+    },
-+    {
-+      "name": "query-migrate",
-+      "ret-type": "143",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-set-capabilities",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "144"
-+    },
-+    {
-+      "name": "query-migrate-capabilities",
-+      "ret-type": "[145]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-set-parameters",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "146"
-+    },
-+    {
-+      "name": "query-migrate-parameters",
-+      "ret-type": "147",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-start-postcopy",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "MIGRATION",
-+      "meta-type": "event",
-+      "arg-type": "148"
-+    },
-+    {
-+      "name": "MIGRATION_PASS",
-+      "meta-type": "event",
-+      "arg-type": "149"
-+    },
-+    {
-+      "name": "COLO_EXIT",
-+      "meta-type": "event",
-+      "arg-type": "150"
-+    },
-+    {
-+      "name": "x-colo-lost-heartbeat",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "migrate_cancel",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-continue",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "151"
-+    },
-+    {
-+      "name": "migrate",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "152"
-+    },
-+    {
-+      "name": "migrate-incoming",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "153"
-+    },
-+    {
-+      "name": "xen-save-devices-state",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "154"
-+    },
-+    {
-+      "name": "xen-set-global-dirty-log",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "155"
-+    },
-+    {
-+      "name": "xen-load-devices-state",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "156"
-+    },
-+    {
-+      "name": "xen-set-replication",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "157"
-+    },
-+    {
-+      "name": "query-xen-replication-status",
-+      "ret-type": "158",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "xen-colo-do-checkpoint",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-colo-status",
-+      "ret-type": "159",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-recover",
-+      "ret-type": "0",
-+      "allow-oob": true,
-+      "meta-type": "command",
-+      "arg-type": "160"
-+    },
-+    {
-+      "name": "migrate-pause",
-+      "ret-type": "0",
-+      "allow-oob": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "UNPLUG_PRIMARY",
-+      "meta-type": "event",
-+      "arg-type": "161"
-+    },
-+    {
-+      "name": "calc-dirty-rate",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "162"
-+    },
-+    {
-+      "name": "query-dirty-rate",
-+      "ret-type": "164",
-+      "meta-type": "command",
-+      "arg-type": "163"
-+    },
-+    {
-+      "name": "set-vcpu-dirty-limit",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "165"
-+    },
-+    {
-+      "name": "cancel-vcpu-dirty-limit",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "166"
-+    },
-+    {
-+      "name": "query-vcpu-dirty-limit",
-+      "ret-type": "[167]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-migrationthreads",
-+      "ret-type": "[168]",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "deprecated"
-+      ]
-+    },
-+    {
-+      "name": "snapshot-save",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "169"
-+    },
-+    {
-+      "name": "snapshot-load",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "170"
-+    },
-+    {
-+      "name": "snapshot-delete",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "171"
-+    },
-+    {
-+      "name": "transaction",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "172"
-+    },
-+    {
-+      "name": "trace-event-get-state",
-+      "ret-type": "[174]",
-+      "meta-type": "command",
-+      "arg-type": "173"
-+    },
-+    {
-+      "name": "trace-event-set-state",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "175"
-+    },
-+    {
-+      "name": "qmp_capabilities",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "176"
-+    },
-+    {
-+      "name": "query-version",
-+      "ret-type": "177",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-commands",
-+      "ret-type": "[178]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "quit",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-qmp-schema",
-+      "ret-type": "[179]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "qom-list",
-+      "ret-type": "[181]",
-+      "meta-type": "command",
-+      "arg-type": "180"
-+    },
-+    {
-+      "name": "qom-get",
-+      "ret-type": "any",
-+      "meta-type": "command",
-+      "arg-type": "182"
-+    },
-+    {
-+      "name": "qom-set",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "183"
-+    },
-+    {
-+      "name": "qom-list-types",
-+      "ret-type": "[185]",
-+      "meta-type": "command",
-+      "arg-type": "184"
-+    },
-+    {
-+      "name": "qom-list-properties",
-+      "ret-type": "[181]",
-+      "meta-type": "command",
-+      "arg-type": "186"
-+    },
-+    {
-+      "name": "object-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "187"
-+    },
-+    {
-+      "name": "object-del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "188"
-+    },
-+    {
-+      "name": "device-list-properties",
-+      "ret-type": "[181]",
-+      "meta-type": "command",
-+      "arg-type": "189"
-+    },
-+    {
-+      "name": "device_add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "190",
-+      "features": [
-+        "json-cli",
-+        "json-cli-hotplug"
-+      ]
-+    },
-+    {
-+      "name": "device_del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "191"
-+    },
-+    {
-+      "name": "DEVICE_DELETED",
-+      "meta-type": "event",
-+      "arg-type": "192"
-+    },
-+    {
-+      "name": "DEVICE_UNPLUG_GUEST_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "193"
-+    },
-+    {
-+      "name": "device-sync-config",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "194",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "query-cpus-fast",
-+      "ret-type": "[195]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-machines",
-+      "ret-type": "[197]",
-+      "meta-type": "command",
-+      "arg-type": "196"
-+    },
-+    {
-+      "name": "query-current-machine",
-+      "ret-type": "198",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-target",
-+      "ret-type": "199",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-uuid",
-+      "ret-type": "200",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-vm-generation-id",
-+      "ret-type": "201",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "system_reset",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "system_powerdown",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "system_wakeup",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "inject-nmi",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-kvm",
-+      "ret-type": "202",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "memsave",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "203"
-+    },
-+    {
-+      "name": "pmemsave",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "204"
-+    },
-+    {
-+      "name": "query-memdev",
-+      "ret-type": "[205]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-hotpluggable-cpus",
-+      "ret-type": "[206]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "set-numa-node",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "207"
-+    },
-+    {
-+      "name": "balloon",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "208"
-+    },
-+    {
-+      "name": "query-balloon",
-+      "ret-type": "209",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "BALLOON_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "210"
-+    },
-+    {
-+      "name": "query-hv-balloon-status-report",
-+      "ret-type": "211",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "HV_BALLOON_STATUS_REPORT",
-+      "meta-type": "event",
-+      "arg-type": "211"
-+    },
-+    {
-+      "name": "query-memory-size-summary",
-+      "ret-type": "212",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-memory-devices",
-+      "ret-type": "[213]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "MEMORY_DEVICE_SIZE_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "214"
-+    },
-+    {
-+      "name": "x-query-irq",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-jit",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-numa",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-opcount",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-ramblock",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-roms",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-usb",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "dumpdtb",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "216"
-+    },
-+    {
-+      "name": "x-query-interrupt-controllers",
-+      "ret-type": "215",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "query-cpu-model-comparison",
-+      "ret-type": "218",
-+      "meta-type": "command",
-+      "arg-type": "217"
-+    },
-+    {
-+      "name": "query-cpu-model-baseline",
-+      "ret-type": "220",
-+      "meta-type": "command",
-+      "arg-type": "219"
-+    },
-+    {
-+      "name": "query-cpu-model-expansion",
-+      "ret-type": "222",
-+      "meta-type": "command",
-+      "arg-type": "221"
-+    },
-+    {
-+      "name": "query-cpu-definitions",
-+      "ret-type": "[223]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "set-cpu-topology",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "224",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "CPU_POLARIZATION_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "225",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "query-s390x-cpu-polarization",
-+      "ret-type": "226",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "query-replay",
-+      "ret-type": "227",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "replay-break",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "228"
-+    },
-+    {
-+      "name": "replay-delete-break",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "replay-seek",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "229"
-+    },
-+    {
-+      "name": "yank",
-+      "ret-type": "0",
-+      "allow-oob": true,
-+      "meta-type": "command",
-+      "arg-type": "230"
-+    },
-+    {
-+      "name": "query-yank",
-+      "ret-type": "[231]",
-+      "allow-oob": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "add_client",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "232"
-+    },
-+    {
-+      "name": "query-name",
-+      "ret-type": "233",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-iothreads",
-+      "ret-type": "[234]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "stop",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "cont",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "x-exit-preconfig",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "human-monitor-command",
-+      "ret-type": "str",
-+      "meta-type": "command",
-+      "arg-type": "235",
-+      "features": [
-+        "savevm-monitor-nodes"
-+      ]
-+    },
-+    {
-+      "name": "getfd",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "236"
-+    },
-+    {
-+      "name": "closefd",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "238"
-+    },
-+    {
-+      "name": "add-fd",
-+      "ret-type": "240",
-+      "meta-type": "command",
-+      "arg-type": "239"
-+    },
-+    {
-+      "name": "remove-fd",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "241"
-+    },
-+    {
-+      "name": "query-fdsets",
-+      "ret-type": "[242]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-command-line-options",
-+      "ret-type": "[244]",
-+      "meta-type": "command",
-+      "arg-type": "243"
-+    },
-+    {
-+      "name": "RTC_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "245"
-+    },
-+    {
-+      "name": "VFU_CLIENT_HANGUP",
-+      "meta-type": "event",
-+      "arg-type": "246"
-+    },
-+    {
-+      "name": "dump-skeys",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "253"
-+    },
-+    {
-+      "name": "query-audiodevs",
-+      "ret-type": "[258]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-acpi-ospm-status",
-+      "ret-type": "[259]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "ACPI_DEVICE_OST",
-+      "meta-type": "event",
-+      "arg-type": "260"
-+    },
-+    {
-+      "name": "query-pci",
-+      "ret-type": "[261]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-stats",
-+      "ret-type": "[263]",
-+      "meta-type": "command",
-+      "arg-type": "262"
-+    },
-+    {
-+      "name": "query-stats-schemas",
-+      "ret-type": "[265]",
-+      "meta-type": "command",
-+      "arg-type": "264"
-+    },
-+    {
-+      "name": "x-query-virtio",
-+      "ret-type": "[266]",
-+      "meta-type": "command",
-+      "arg-type": "0",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-virtio-status",
-+      "ret-type": "268",
-+      "meta-type": "command",
-+      "arg-type": "267",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-virtio-queue-status",
-+      "ret-type": "270",
-+      "meta-type": "command",
-+      "arg-type": "269",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-virtio-vhost-queue-status",
-+      "ret-type": "272",
-+      "meta-type": "command",
-+      "arg-type": "271",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "x-query-virtio-queue-element",
-+      "ret-type": "274",
-+      "meta-type": "command",
-+      "arg-type": "273",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "VFIO_MIGRATION",
-+      "meta-type": "event",
-+      "arg-type": "275"
-+    },
-+    {
-+      "name": "query-cryptodev",
-+      "ret-type": "[276]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "cxl-inject-general-media-event",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "277"
-+    },
-+    {
-+      "name": "cxl-inject-dram-event",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "278"
-+    },
-+    {
-+      "name": "cxl-inject-memory-module-event",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "279"
-+    },
-+    {
-+      "name": "cxl-inject-poison",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "280"
-+    },
-+    {
-+      "name": "cxl-inject-uncorrectable-errors",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "281"
-+    },
-+    {
-+      "name": "cxl-inject-correctable-error",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "282"
-+    },
-+    {
-+      "name": "cxl-add-dynamic-capacity",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "283",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "cxl-release-dynamic-capacity",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "284",
-+      "features": [
-+        "unstable"
-+      ]
-+    },
-+    {
-+      "name": "0",
-+      "members": [],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "1",
-+      "members": [
-+        {
-+          "name": "running",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "status",
-+          "type": "285"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "2",
-+      "members": [
-+        {
-+          "name": "guest",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "286"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "3",
-+      "members": [
-+        {
-+          "name": "guest",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "286"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "4",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "287"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "5",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "287"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "6",
-+      "members": [
-+        {
-+          "name": "reboot",
-+          "default": null,
-+          "type": "288"
-+        },
-+        {
-+          "name": "shutdown",
-+          "default": null,
-+          "type": "289"
-+        },
-+        {
-+          "name": "panic",
-+          "default": null,
-+          "type": "290"
-+        },
-+        {
-+          "name": "watchdog",
-+          "default": null,
-+          "type": "287"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "7",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "291"
-+        },
-+        {
-+          "name": "info",
-+          "default": null,
-+          "type": "292"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "8",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "291"
-+        },
-+        {
-+          "name": "info",
-+          "default": null,
-+          "type": "292"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "9",
-+      "members": [
-+        {
-+          "name": "recipient",
-+          "type": "293"
-+        },
-+        {
-+          "name": "action",
-+          "type": "294"
-+        },
-+        {
-+          "name": "flags",
-+          "type": "295"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "10",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "status",
-+          "type": "296"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "11",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "12",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "13",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "14",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "15",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "16",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[17]",
-+      "element-type": "17",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "17",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "status",
-+          "type": "296"
-+        },
-+        {
-+          "name": "current-progress",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total-progress",
-+          "type": "int"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[18]",
-+      "element-type": "18",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "18",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "19",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "20",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "21",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "22",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "23",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "24",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "read-only-mode",
-+          "default": null,
-+          "type": "298"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "25",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tray-open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "26",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "27",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "bps",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "28",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "boundaries",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "boundaries-read",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "boundaries-write",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "boundaries-zap",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "boundaries-flush",
-+          "default": null,
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[29]",
-+      "element-type": "29",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "29",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "qdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "removable",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "locked",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "inserted",
-+          "default": null,
-+          "type": "41"
-+        },
-+        {
-+          "name": "tray_open",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "io-status",
-+          "default": null,
-+          "type": "299"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "30",
-+      "members": [
-+        {
-+          "name": "query-nodes",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[31]",
-+      "element-type": "31",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "31",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "qdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "stats",
-+          "type": "300"
-+        },
-+        {
-+          "name": "driver-specific",
-+          "default": null,
-+          "type": "301"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "31"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "31"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[32]",
-+      "element-type": "32",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "32",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "mirror",
-+          "type": "302"
-+        },
-+        {
-+          "case": "commit",
-+          "type": "0"
-+        },
-+        {
-+          "case": "stream",
-+          "type": "0"
-+        },
-+        {
-+          "case": "backup",
-+          "type": "0"
-+        },
-+        {
-+          "case": "create",
-+          "type": "0"
-+        },
-+        {
-+          "case": "amend",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-load",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-save",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-delete",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "busy",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "paused",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "io-status",
-+          "type": "299"
-+        },
-+        {
-+          "name": "ready",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "status",
-+          "type": "296"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "33",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "34",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "snapshot-file",
-+          "type": "str"
-+        },
-+        {
-+          "name": "snapshot-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "303"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "35",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "overlay",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "36",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "image-node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-file",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "37",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "base-node",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "base",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "top-node",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "top",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-mask-protocol",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "on-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "38",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "305"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmap-mode",
-+          "default": null,
-+          "type": "306"
-+        },
-+        {
-+          "name": "compress",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "discard-source",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-perf",
-+          "default": null,
-+          "type": "307",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "303"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "39",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "305"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmap-mode",
-+          "default": null,
-+          "type": "306"
-+        },
-+        {
-+          "name": "compress",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "discard-source",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-perf",
-+          "default": null,
-+          "type": "307",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "40",
-+      "members": [
-+        {
-+          "name": "flat",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[41]",
-+      "element-type": "41",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "41",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ro",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "drv",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing_file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing_file_depth",
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypted",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "detect_zeroes",
-+          "type": "308"
-+        },
-+        {
-+          "name": "bps",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "image",
-+          "type": "309"
-+        },
-+        {
-+          "name": "bps_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr_max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_rd_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps_wr_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_rd_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_wr_max_length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops_size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cache",
-+          "type": "310"
-+        },
-+        {
-+          "name": "write_threshold",
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-bitmaps",
-+          "default": null,
-+          "type": "[311]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "42",
-+      "members": [
-+        {
-+          "name": "nodes",
-+          "type": "[312]"
-+        },
-+        {
-+          "name": "edges",
-+          "type": "[313]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "43",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "replaces",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "305"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "303"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "granularity",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "buf-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "unmap",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "copy-mode",
-+          "default": null,
-+          "type": "314"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "44",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "granularity",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "persistent",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "disabled",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "45",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "46",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmaps",
-+          "type": "[315]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "47",
-+      "members": [
-+        {
-+          "name": "sha256",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "48",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "replaces",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "305"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "granularity",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "buf-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "copy-mode",
-+          "default": null,
-+          "type": "314"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "49",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "base",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "base-node",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-mask-protocol",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "bottom",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "on-error",
-+          "default": null,
-+          "type": "304"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "50",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "51",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "52",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "53",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "54",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "55",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "56",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "57",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "mirror",
-+          "type": "316"
-+        },
-+        {
-+          "case": "commit",
-+          "type": "0"
-+        },
-+        {
-+          "case": "stream",
-+          "type": "0"
-+        },
-+        {
-+          "case": "backup",
-+          "type": "0"
-+        },
-+        {
-+          "case": "create",
-+          "type": "0"
-+        },
-+        {
-+          "case": "amend",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-load",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-save",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-delete",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "297"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "58",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "blkdebug",
-+          "type": "320"
-+        },
-+        {
-+          "case": "blklogwrites",
-+          "type": "321"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "322"
-+        },
-+        {
-+          "case": "blkreplay",
-+          "type": "323"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "324"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "324"
-+        },
-+        {
-+          "case": "compress",
-+          "type": "324"
-+        },
-+        {
-+          "case": "copy-before-write",
-+          "type": "325"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "326"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "324"
-+        },
-+        {
-+          "case": "file",
-+          "type": "327"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "328"
-+        },
-+        {
-+          "case": "ftps",
-+          "type": "329"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "330"
-+        },
-+        {
-+          "case": "host_cdrom",
-+          "type": "327"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "327"
-+        },
-+        {
-+          "case": "http",
-+          "type": "331"
-+        },
-+        {
-+          "case": "https",
-+          "type": "332"
-+        },
-+        {
-+          "case": "io_uring",
-+          "type": "333"
-+        },
-+        {
-+          "case": "iscsi",
-+          "type": "334"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "335"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "336"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "337"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "338"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "338"
-+        },
-+        {
-+          "case": "nvme",
-+          "type": "339"
-+        },
-+        {
-+          "case": "nvme-io_uring",
-+          "type": "340"
-+        },
-+        {
-+          "case": "parallels",
-+          "type": "324"
-+        },
-+        {
-+          "case": "preallocate",
-+          "type": "341"
-+        },
-+        {
-+          "case": "qcow2",
-+          "type": "342"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "343"
-+        },
-+        {
-+          "case": "qed",
-+          "type": "344"
-+        },
-+        {
-+          "case": "quorum",
-+          "type": "345"
-+        },
-+        {
-+          "case": "raw",
-+          "type": "346"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "347"
-+        },
-+        {
-+          "case": "replication",
-+          "type": "348"
-+        },
-+        {
-+          "case": "snapshot-access",
-+          "type": "324"
-+        },
-+        {
-+          "case": "ssh",
-+          "type": "349"
-+        },
-+        {
-+          "case": "throttle",
-+          "type": "350"
-+        },
-+        {
-+          "case": "vdi",
-+          "type": "324"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "324"
-+        },
-+        {
-+          "case": "virtio-blk-vfio-pci",
-+          "type": "351"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-user",
-+          "type": "352"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-vdpa",
-+          "type": "353"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "344"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "324"
-+        },
-+        {
-+          "case": "vvfat",
-+          "type": "354"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "317"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "discard",
-+          "default": null,
-+          "type": "318"
-+        },
-+        {
-+          "name": "cache",
-+          "default": null,
-+          "type": "319"
-+        },
-+        {
-+          "name": "read-only",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-read-only",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "force-share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "detect-zeroes",
-+          "default": null,
-+          "type": "308"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "59",
-+      "members": [
-+        {
-+          "name": "options",
-+          "type": "[58]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "60",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "61",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "options",
-+          "type": "355"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "62",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "options",
-+          "type": "356"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "63",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "msg",
-+          "type": "str"
-+        },
-+        {
-+          "name": "offset",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "fatal",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "64",
-+      "members": [
-+        {
-+          "name": "qom-path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "operation",
-+          "type": "357"
-+        },
-+        {
-+          "name": "action",
-+          "type": "358"
-+        },
-+        {
-+          "name": "nospace",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "65",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "66",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "67",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "operation",
-+          "type": "357"
-+        },
-+        {
-+          "name": "action",
-+          "type": "358"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "68",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "69",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "297"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "70",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "amount-exceeded",
-+          "type": "int"
-+        },
-+        {
-+          "name": "write-threshold",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "71",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "write-threshold",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "72",
-+      "members": [
-+        {
-+          "name": "parent",
-+          "type": "str"
-+        },
-+        {
-+          "name": "child",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "73",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "iothread",
-+          "type": "359"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "74",
-+      "members": [
-+        {
-+          "name": "reference",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sector-num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "sectors-count",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "75",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "360"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sector-num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "sectors-count",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "76",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "77",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "78",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vm-state-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "date-sec",
-+          "type": "int"
-+        },
-+        {
-+          "name": "date-nsec",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vm-clock-sec",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vm-clock-nsec",
-+          "type": "int"
-+        },
-+        {
-+          "name": "icount",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "79",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "361"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "max-connections",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "80",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "description",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "writable",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "81",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "362"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "82",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "nbd",
-+          "type": "364"
-+        },
-+        {
-+          "case": "vhost-user-blk",
-+          "type": "365"
-+        },
-+        {
-+          "case": "fuse",
-+          "type": "366"
-+        },
-+        {
-+          "case": "vduse-blk",
-+          "type": "367"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "363"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "fixed-iothread",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "iothread",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "writable",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "writethrough",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "83",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "362"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "84",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[85]",
-+      "element-type": "85",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "85",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "363"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "shutting-down",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[86]",
-+      "element-type": "86",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "86",
-+      "members": [
-+        {
-+          "name": "label",
-+          "type": "str"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "frontend-open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[87]",
-+      "element-type": "87",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "87",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "88",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "data",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "368"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "89",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "368"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "str",
-+      "json-type": "string",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "90",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backend",
-+          "type": "369"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "91",
-+      "members": [
-+        {
-+          "name": "pty",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "92",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backend",
-+          "type": "369"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "93",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "94",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "95",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "96",
-+      "members": [
-+        {
-+          "name": "paging",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "protocol",
-+          "type": "str"
-+        },
-+        {
-+          "name": "detach",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "begin",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "370"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "97",
-+      "members": [
-+        {
-+          "name": "status",
-+          "type": "371"
-+        },
-+        {
-+          "name": "completed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "98",
-+      "members": [
-+        {
-+          "name": "result",
-+          "type": "97"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "99",
-+      "members": [
-+        {
-+          "name": "formats",
-+          "type": "[370]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "100",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "up",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "101",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "nic",
-+          "type": "373"
-+        },
-+        {
-+          "case": "user",
-+          "type": "374"
-+        },
-+        {
-+          "case": "tap",
-+          "type": "375"
-+        },
-+        {
-+          "case": "l2tpv3",
-+          "type": "376"
-+        },
-+        {
-+          "case": "socket",
-+          "type": "377"
-+        },
-+        {
-+          "case": "stream",
-+          "type": "378"
-+        },
-+        {
-+          "case": "dgram",
-+          "type": "379"
-+        },
-+        {
-+          "case": "vde",
-+          "type": "380"
-+        },
-+        {
-+          "case": "bridge",
-+          "type": "381"
-+        },
-+        {
-+          "case": "hubport",
-+          "type": "382"
-+        },
-+        {
-+          "case": "netmap",
-+          "type": "383"
-+        },
-+        {
-+          "case": "af-xdp",
-+          "type": "384"
-+        },
-+        {
-+          "case": "vhost-user",
-+          "type": "385"
-+        },
-+        {
-+          "case": "vhost-vdpa",
-+          "type": "386"
-+        },
-+        {
-+          "case": "none",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "372"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "102",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "103",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[104]",
-+      "element-type": "104",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "104",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "promiscuous",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "multicast",
-+          "type": "390"
-+        },
-+        {
-+          "name": "unicast",
-+          "type": "390"
-+        },
-+        {
-+          "name": "vlan",
-+          "type": "390"
-+        },
-+        {
-+          "name": "broadcast-allowed",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "multicast-overflow",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "unicast-overflow",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "main-mac",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vlan-table",
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "unicast-table",
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "multicast-table",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "105",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "106",
-+      "members": [
-+        {
-+          "name": "initial",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rounds",
-+          "type": "int"
-+        },
-+        {
-+          "name": "step",
-+          "type": "int"
-+        },
-+        {
-+          "name": "interfaces",
-+          "default": null,
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "107",
-+      "members": [
-+        {
-+          "name": "device-id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "108",
-+      "members": [
-+        {
-+          "name": "netdev-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "addr",
-+          "type": "391"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "109",
-+      "members": [
-+        {
-+          "name": "netdev-id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "110",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "392"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "111",
-+      "members": [
-+        {
-+          "name": "object",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "112",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "113",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "ports",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "114",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[115]",
-+      "element-type": "115",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "115",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "link-up",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "duplex",
-+          "type": "393"
-+        },
-+        {
-+          "name": "autoneg",
-+          "type": "394"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "116",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tbl-id",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[117]",
-+      "element-type": "117",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "117",
-+      "members": [
-+        {
-+          "name": "cookie",
-+          "type": "int"
-+        },
-+        {
-+          "name": "hits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "key",
-+          "type": "395"
-+        },
-+        {
-+          "name": "mask",
-+          "type": "396"
-+        },
-+        {
-+          "name": "action",
-+          "type": "397"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "118",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[119]",
-+      "element-type": "119",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "119",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "type",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "pport",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "index",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "out-pport",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "set-vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "pop-vlan",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group-ids",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "set-eth-src",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "set-eth-dst",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ttl-check",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[120]",
-+      "element-type": "120",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "120",
-+      "members": [
-+        {
-+          "name": "tpm-tis"
-+        },
-+        {
-+          "name": "tpm-crb"
-+        },
-+        {
-+          "name": "tpm-spapr"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "tpm-tis",
-+        "tpm-crb",
-+        "tpm-spapr"
-+      ]
-+    },
-+    {
-+      "name": "[121]",
-+      "element-type": "121",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "121",
-+      "members": [
-+        {
-+          "name": "passthrough"
-+        },
-+        {
-+          "name": "emulator"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "passthrough",
-+        "emulator"
-+      ]
-+    },
-+    {
-+      "name": "[122]",
-+      "element-type": "122",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "122",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "model",
-+          "type": "120"
-+        },
-+        {
-+          "name": "options",
-+          "type": "398"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "123",
-+      "tag": "protocol",
-+      "variants": [
-+        {
-+          "case": "vnc",
-+          "type": "401"
-+        },
-+        {
-+          "case": "spice",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "399"
-+        },
-+        {
-+          "name": "password",
-+          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "default": null,
-+          "type": "400"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "124",
-+      "tag": "protocol",
-+      "variants": [
-+        {
-+          "case": "vnc",
-+          "type": "402"
-+        },
-+        {
-+          "case": "spice",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "399"
-+        },
-+        {
-+          "name": "time",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "125",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "head",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "403"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "130",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "default": null,
-+          "type": "408"
-+        },
-+        {
-+          "name": "service",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "clients",
-+          "default": null,
-+          "type": "[409]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[131]",
-+      "element-type": "131",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "131",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "type": "[410]"
-+        },
-+        {
-+          "name": "clients",
-+          "type": "[409]"
-+        },
-+        {
-+          "name": "auth",
-+          "type": "411"
-+        },
-+        {
-+          "name": "vencrypt",
-+          "default": null,
-+          "type": "412"
-+        },
-+        {
-+          "name": "display",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "132",
-+      "members": [
-+        {
-+          "name": "password",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "133",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "413"
-+        },
-+        {
-+          "name": "client",
-+          "type": "414"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "134",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "413"
-+        },
-+        {
-+          "name": "client",
-+          "type": "409"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "135",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "413"
-+        },
-+        {
-+          "name": "client",
-+          "type": "409"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[136]",
-+      "element-type": "136",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "136",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "current",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "absolute",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "137",
-+      "members": [
-+        {
-+          "name": "keys",
-+          "type": "[415]"
-+        },
-+        {
-+          "name": "hold-time",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "138",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "head",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "events",
-+          "type": "[416]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "139",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "gtk",
-+          "type": "419"
-+        },
-+        {
-+          "case": "curses",
-+          "type": "421"
-+        },
-+        {
-+          "case": "egl-headless",
-+          "type": "422"
-+        },
-+        {
-+          "case": "dbus",
-+          "type": "423"
-+        },
-+        {
-+          "case": "sdl",
-+          "type": "424"
-+        },
-+        {
-+          "case": "default",
-+          "type": "0"
-+        },
-+        {
-+          "case": "none",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "417"
-+        },
-+        {
-+          "name": "full-screen",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "window-close",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "show-cursor",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "gl",
-+          "default": null,
-+          "type": "418"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "140",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "vnc",
-+          "type": "426"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "425"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "141",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "vnc",
-+          "type": "428"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "427"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "142",
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "str"
-+        },
-+        {
-+          "name": "hostname",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tls-port",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cert-subject",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "143",
-+      "members": [
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "429"
-+        },
-+        {
-+          "name": "ram",
-+          "default": null,
-+          "type": "430"
-+        },
-+        {
-+          "name": "vfio",
-+          "default": null,
-+          "type": "431"
-+        },
-+        {
-+          "name": "xbzrle-cache",
-+          "default": null,
-+          "type": "432"
-+        },
-+        {
-+          "name": "total-time",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "expected-downtime",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "setup-time",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-percentage",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "error-desc",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "blocked-reasons",
-+          "default": null,
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "postcopy-blocktime",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "postcopy-vcpu-blocktime",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "socket-address",
-+          "default": null,
-+          "type": "[391]"
-+        },
-+        {
-+          "name": "dirty-limit-throttle-time-per-round",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-limit-ring-full-time",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "144",
-+      "members": [
-+        {
-+          "name": "capabilities",
-+          "type": "[145]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[145]",
-+      "element-type": "145",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "145",
-+      "members": [
-+        {
-+          "name": "capability",
-+          "type": "433"
-+        },
-+        {
-+          "name": "state",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "146",
-+      "members": [
-+        {
-+          "name": "announce-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-rounds",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-step",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-trigger-threshold",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-increment",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-tailslow",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "359"
-+        },
-+        {
-+          "name": "tls-hostname",
-+          "default": null,
-+          "type": "359"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "default": null,
-+          "type": "359"
-+        },
-+        {
-+          "name": "max-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "avail-switchover-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-checkpoint-delay",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "multifd-channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "xbzrle-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-postcopy-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-cpu-throttle",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-compression",
-+          "default": null,
-+          "type": "434"
-+        },
-+        {
-+          "name": "multifd-zlib-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-qatzip-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-zstd-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-bitmap-mapping",
-+          "default": null,
-+          "type": "[435]"
-+        },
-+        {
-+          "name": "x-vcpu-dirty-limit-period",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "vcpu-dirty-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "436"
-+        },
-+        {
-+          "name": "zero-page-detection",
-+          "default": null,
-+          "type": "437"
-+        },
-+        {
-+          "name": "direct-io",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "147",
-+      "members": [
-+        {
-+          "name": "announce-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-rounds",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "announce-step",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-trigger-threshold",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-increment",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-tailslow",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-hostname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "max-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "avail-switchover-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-checkpoint-delay",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "multifd-channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "xbzrle-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-postcopy-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-cpu-throttle",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-compression",
-+          "default": null,
-+          "type": "434"
-+        },
-+        {
-+          "name": "multifd-zlib-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-qatzip-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-zstd-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-bitmap-mapping",
-+          "default": null,
-+          "type": "[435]"
-+        },
-+        {
-+          "name": "x-vcpu-dirty-limit-period",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "vcpu-dirty-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "436"
-+        },
-+        {
-+          "name": "zero-page-detection",
-+          "default": null,
-+          "type": "437"
-+        },
-+        {
-+          "name": "direct-io",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "148",
-+      "members": [
-+        {
-+          "name": "status",
-+          "type": "429"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "149",
-+      "members": [
-+        {
-+          "name": "pass",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "150",
-+      "members": [
-+        {
-+          "name": "mode",
-+          "type": "438"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "439"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "151",
-+      "members": [
-+        {
-+          "name": "state",
-+          "type": "429"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "152",
-+      "members": [
-+        {
-+          "name": "uri",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "[440]"
-+        },
-+        {
-+          "name": "detach",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "resume",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "153",
-+      "members": [
-+        {
-+          "name": "uri",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "[440]"
-+        },
-+        {
-+          "name": "exit-on-error",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "154",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "live",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "155",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "156",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "157",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "primary",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "failover",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "158",
-+      "members": [
-+        {
-+          "name": "error",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "desc",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "159",
-+      "members": [
-+        {
-+          "name": "mode",
-+          "type": "438"
-+        },
-+        {
-+          "name": "last-mode",
-+          "type": "438"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "439"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "160",
-+      "members": [
-+        {
-+          "name": "uri",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "161",
-+      "members": [
-+        {
-+          "name": "device-id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "162",
-+      "members": [
-+        {
-+          "name": "calc-time",
-+          "type": "int"
-+        },
-+        {
-+          "name": "calc-time-unit",
-+          "default": null,
-+          "type": "441"
-+        },
-+        {
-+          "name": "sample-pages",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "442"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "163",
-+      "members": [
-+        {
-+          "name": "calc-time-unit",
-+          "default": null,
-+          "type": "441"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "164",
-+      "members": [
-+        {
-+          "name": "dirty-rate",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "status",
-+          "type": "443"
-+        },
-+        {
-+          "name": "start-time",
-+          "type": "int"
-+        },
-+        {
-+          "name": "calc-time",
-+          "type": "int"
-+        },
-+        {
-+          "name": "calc-time-unit",
-+          "type": "441"
-+        },
-+        {
-+          "name": "sample-pages",
-+          "type": "int"
-+        },
-+        {
-+          "name": "mode",
-+          "type": "442"
-+        },
-+        {
-+          "name": "vcpu-dirty-rate",
-+          "default": null,
-+          "type": "[444]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "165",
-+      "members": [
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-rate",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "166",
-+      "members": [
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[167]",
-+      "element-type": "167",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "167",
-+      "members": [
-+        {
-+          "name": "cpu-index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "limit-rate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "current-rate",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[168]",
-+      "element-type": "168",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "168",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "thread-id",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "169",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tag",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vmstate",
-+          "type": "str"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "170",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tag",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vmstate",
-+          "type": "str"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "171",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tag",
-+          "type": "str"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "172",
-+      "members": [
-+        {
-+          "name": "actions",
-+          "type": "[445]"
-+        },
-+        {
-+          "name": "properties",
-+          "default": null,
-+          "type": "446"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "173",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[174]",
-+      "element-type": "174",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "174",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "state",
-+          "type": "447"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "175",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ignore-unavailable",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "176",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "default": null,
-+          "type": "[448]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "177",
-+      "members": [
-+        {
-+          "name": "qemu",
-+          "type": "449"
-+        },
-+        {
-+          "name": "package",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[178]",
-+      "element-type": "178",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "178",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[179]",
-+      "element-type": "179",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "179",
-+      "tag": "meta-type",
-+      "variants": [
-+        {
-+          "case": "builtin",
-+          "type": "451"
-+        },
-+        {
-+          "case": "enum",
-+          "type": "452"
-+        },
-+        {
-+          "case": "array",
-+          "type": "453"
-+        },
-+        {
-+          "case": "object",
-+          "type": "454"
-+        },
-+        {
-+          "case": "alternate",
-+          "type": "455"
-+        },
-+        {
-+          "case": "command",
-+          "type": "456"
-+        },
-+        {
-+          "case": "event",
-+          "type": "457"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "meta-type",
-+          "type": "450"
-+        },
-+        {
-+          "name": "features",
-+          "default": null,
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "180",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[181]",
-+      "element-type": "181",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "181",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "description",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "default-value",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "182",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "any",
-+      "json-type": "value",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "183",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        },
-+        {
-+          "name": "value",
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "184",
-+      "members": [
-+        {
-+          "name": "implements",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[185]",
-+      "element-type": "185",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "185",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "186",
-+      "members": [
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "187",
-+      "tag": "qom-type",
-+      "variants": [
-+        {
-+          "case": "acpi-generic-initiator",
-+          "type": "459"
-+        },
-+        {
-+          "case": "acpi-generic-port",
-+          "type": "460"
-+        },
-+        {
-+          "case": "authz-list",
-+          "type": "461"
-+        },
-+        {
-+          "case": "authz-listfile",
-+          "type": "462"
-+        },
-+        {
-+          "case": "authz-pam",
-+          "type": "463"
-+        },
-+        {
-+          "case": "authz-simple",
-+          "type": "464"
-+        },
-+        {
-+          "case": "can-host-socketcan",
-+          "type": "465"
-+        },
-+        {
-+          "case": "colo-compare",
-+          "type": "466"
-+        },
-+        {
-+          "case": "cryptodev-backend",
-+          "type": "467"
-+        },
-+        {
-+          "case": "cryptodev-backend-builtin",
-+          "type": "467"
-+        },
-+        {
-+          "case": "cryptodev-backend-lkcf",
-+          "type": "467"
-+        },
-+        {
-+          "case": "cryptodev-vhost-user",
-+          "type": "468"
-+        },
-+        {
-+          "case": "dbus-vmstate",
-+          "type": "469"
-+        },
-+        {
-+          "case": "filter-buffer",
-+          "type": "470"
-+        },
-+        {
-+          "case": "filter-dump",
-+          "type": "471"
-+        },
-+        {
-+          "case": "filter-mirror",
-+          "type": "472"
-+        },
-+        {
-+          "case": "filter-redirector",
-+          "type": "473"
-+        },
-+        {
-+          "case": "filter-replay",
-+          "type": "474"
-+        },
-+        {
-+          "case": "filter-rewriter",
-+          "type": "475"
-+        },
-+        {
-+          "case": "input-barrier",
-+          "type": "476"
-+        },
-+        {
-+          "case": "input-linux",
-+          "type": "477"
-+        },
-+        {
-+          "case": "iommufd",
-+          "type": "478"
-+        },
-+        {
-+          "case": "iothread",
-+          "type": "479"
-+        },
-+        {
-+          "case": "main-loop",
-+          "type": "480"
-+        },
-+        {
-+          "case": "memory-backend-epc",
-+          "type": "481"
-+        },
-+        {
-+          "case": "memory-backend-file",
-+          "type": "482"
-+        },
-+        {
-+          "case": "memory-backend-memfd",
-+          "type": "483"
-+        },
-+        {
-+          "case": "memory-backend-ram",
-+          "type": "484"
-+        },
-+        {
-+          "case": "memory-backend-shm",
-+          "type": "485"
-+        },
-+        {
-+          "case": "pr-manager-helper",
-+          "type": "486"
-+        },
-+        {
-+          "case": "qtest",
-+          "type": "487"
-+        },
-+        {
-+          "case": "rng-builtin",
-+          "type": "488"
-+        },
-+        {
-+          "case": "rng-egd",
-+          "type": "489"
-+        },
-+        {
-+          "case": "rng-random",
-+          "type": "490"
-+        },
-+        {
-+          "case": "secret",
-+          "type": "491"
-+        },
-+        {
-+          "case": "secret_keyring",
-+          "type": "492"
-+        },
-+        {
-+          "case": "sev-guest",
-+          "type": "493"
-+        },
-+        {
-+          "case": "sev-snp-guest",
-+          "type": "494"
-+        },
-+        {
-+          "case": "thread-context",
-+          "type": "495"
-+        },
-+        {
-+          "case": "throttle-group",
-+          "type": "496"
-+        },
-+        {
-+          "case": "tls-creds-anon",
-+          "type": "497"
-+        },
-+        {
-+          "case": "tls-creds-psk",
-+          "type": "498"
-+        },
-+        {
-+          "case": "tls-creds-x509",
-+          "type": "499"
-+        },
-+        {
-+          "case": "tls-cipher-suites",
-+          "type": "500"
-+        },
-+        {
-+          "case": "x-remote-object",
-+          "type": "501"
-+        },
-+        {
-+          "case": "x-vfio-user-server",
-+          "type": "502"
-+        },
-+        {
-+          "case": "can-bus",
-+          "type": "0"
-+        },
-+        {
-+          "case": "pef-guest",
-+          "type": "0"
-+        },
-+        {
-+          "case": "s390-pv-guest",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "qom-type",
-+          "type": "458"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "188",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "189",
-+      "members": [
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "190",
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bus",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "191",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "192",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "193",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "194",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[195]",
-+      "element-type": "195",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "195",
-+      "tag": "target",
-+      "variants": [
-+        {
-+          "case": "s390x",
-+          "type": "505"
-+        },
-+        {
-+          "case": "aarch64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "alpha",
-+          "type": "0"
-+        },
-+        {
-+          "case": "arm",
-+          "type": "0"
-+        },
-+        {
-+          "case": "avr",
-+          "type": "0"
-+        },
-+        {
-+          "case": "hppa",
-+          "type": "0"
-+        },
-+        {
-+          "case": "i386",
-+          "type": "0"
-+        },
-+        {
-+          "case": "loongarch64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "m68k",
-+          "type": "0"
-+        },
-+        {
-+          "case": "microblaze",
-+          "type": "0"
-+        },
-+        {
-+          "case": "microblazeel",
-+          "type": "0"
-+        },
-+        {
-+          "case": "mips",
-+          "type": "0"
-+        },
-+        {
-+          "case": "mips64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "mips64el",
-+          "type": "0"
-+        },
-+        {
-+          "case": "mipsel",
-+          "type": "0"
-+        },
-+        {
-+          "case": "or1k",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ppc",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ppc64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "riscv32",
-+          "type": "0"
-+        },
-+        {
-+          "case": "riscv64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "rx",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sh4",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sh4eb",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sparc",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sparc64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "tricore",
-+          "type": "0"
-+        },
-+        {
-+          "case": "x86_64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "xtensa",
-+          "type": "0"
-+        },
-+        {
-+          "case": "xtensaeb",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "cpu-index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "qom-path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "thread-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "503"
-+        },
-+        {
-+          "name": "target",
-+          "type": "504"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "196",
-+      "members": [
-+        {
-+          "name": "compat-props",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[197]",
-+      "element-type": "197",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "197",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "alias",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "is-default",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "cpu-max",
-+          "type": "int"
-+        },
-+        {
-+          "name": "hotpluggable-cpus",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "numa-mem-supported",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "deprecated",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "default-cpu-type",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "default-ram-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "acpi",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "compat-props",
-+          "default": null,
-+          "type": "[506]",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "198",
-+      "members": [
-+        {
-+          "name": "wakeup-suspend-support",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "199",
-+      "members": [
-+        {
-+          "name": "arch",
-+          "type": "504"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "200",
-+      "members": [
-+        {
-+          "name": "UUID",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "201",
-+      "members": [
-+        {
-+          "name": "guid",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "202",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "present",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "203",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "204",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[205]",
-+      "element-type": "205",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "205",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "merge",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dump",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "share",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "policy",
-+          "type": "507"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[206]",
-+      "element-type": "206",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "206",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vcpus-count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "props",
-+          "type": "503"
-+        },
-+        {
-+          "name": "qom-path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "207",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "node",
-+          "type": "509"
-+        },
-+        {
-+          "case": "dist",
-+          "type": "510"
-+        },
-+        {
-+          "case": "cpu",
-+          "type": "511"
-+        },
-+        {
-+          "case": "hmat-lb",
-+          "type": "512"
-+        },
-+        {
-+          "case": "hmat-cache",
-+          "type": "513"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "508"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "208",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "209",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "210",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "211",
-+      "members": [
-+        {
-+          "name": "committed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "available",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "212",
-+      "members": [
-+        {
-+          "name": "base-memory",
-+          "type": "int"
-+        },
-+        {
-+          "name": "plugged-memory",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[213]",
-+      "element-type": "213",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "213",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "dimm",
-+          "type": "515"
-+        },
-+        {
-+          "case": "nvdimm",
-+          "type": "515"
-+        },
-+        {
-+          "case": "virtio-pmem",
-+          "type": "516"
-+        },
-+        {
-+          "case": "virtio-mem",
-+          "type": "517"
-+        },
-+        {
-+          "case": "sgx-epc",
-+          "type": "518"
-+        },
-+        {
-+          "case": "hv-balloon",
-+          "type": "519"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "514"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "214",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "qom-path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "215",
-+      "members": [
-+        {
-+          "name": "human-readable-text",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "216",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "217",
-+      "members": [
-+        {
-+          "name": "modela",
-+          "type": "520"
-+        },
-+        {
-+          "name": "modelb",
-+          "type": "520"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "218",
-+      "members": [
-+        {
-+          "name": "result",
-+          "type": "521"
-+        },
-+        {
-+          "name": "responsible-properties",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "219",
-+      "members": [
-+        {
-+          "name": "modela",
-+          "type": "520"
-+        },
-+        {
-+          "name": "modelb",
-+          "type": "520"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "220",
-+      "members": [
-+        {
-+          "name": "model",
-+          "type": "520"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "221",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "522"
-+        },
-+        {
-+          "name": "model",
-+          "type": "520"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "222",
-+      "members": [
-+        {
-+          "name": "model",
-+          "type": "520"
-+        },
-+        {
-+          "name": "deprecated-props",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[223]",
-+      "element-type": "223",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "223",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "migration-safe",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "static",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "unavailable-features",
-+          "default": null,
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "alias-of",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "deprecated",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "224",
-+      "members": [
-+        {
-+          "name": "core-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "socket-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "book-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "drawer-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "entitlement",
-+          "default": null,
-+          "type": "523"
-+        },
-+        {
-+          "name": "dedicated",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "225",
-+      "members": [
-+        {
-+          "name": "polarization",
-+          "type": "524"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "226",
-+      "members": [
-+        {
-+          "name": "polarization",
-+          "type": "524"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "227",
-+      "members": [
-+        {
-+          "name": "mode",
-+          "type": "525"
-+        },
-+        {
-+          "name": "filename",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "icount",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "228",
-+      "members": [
-+        {
-+          "name": "icount",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "229",
-+      "members": [
-+        {
-+          "name": "icount",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "230",
-+      "members": [
-+        {
-+          "name": "instances",
-+          "type": "[231]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[231]",
-+      "element-type": "231",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "231",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "block-node",
-+          "type": "527"
-+        },
-+        {
-+          "case": "chardev",
-+          "type": "528"
-+        },
-+        {
-+          "case": "migration",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "526"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "232",
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "str"
-+        },
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        },
-+        {
-+          "name": "skipauth",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "tls",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "233",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[234]",
-+      "element-type": "234",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "234",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "thread-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-max-ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-grow",
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-shrink",
-+          "type": "int"
-+        },
-+        {
-+          "name": "aio-max-batch",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "235",
-+      "members": [
-+        {
-+          "name": "command-line",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "236",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "238",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "239",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "240",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "241",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[242]",
-+      "element-type": "242",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "242",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fds",
-+          "type": "[529]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "243",
-+      "members": [
-+        {
-+          "name": "option",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[244]",
-+      "element-type": "244",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "244",
-+      "members": [
-+        {
-+          "name": "option",
-+          "type": "str"
-+        },
-+        {
-+          "name": "parameters",
-+          "type": "[530]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "245",
-+      "members": [
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "qom-path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "246",
-+      "members": [
-+        {
-+          "name": "vfu-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vfu-qom-path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "dev-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "dev-qom-path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "253",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[258]",
-+      "element-type": "258",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "258",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "none",
-+          "type": "538"
-+        },
-+        {
-+          "case": "alsa",
-+          "type": "539"
-+        },
-+        {
-+          "case": "dbus",
-+          "type": "538"
-+        },
-+        {
-+          "case": "jack",
-+          "type": "542"
-+        },
-+        {
-+          "case": "oss",
-+          "type": "543"
-+        },
-+        {
-+          "case": "pa",
-+          "type": "544"
-+        },
-+        {
-+          "case": "pipewire",
-+          "type": "545"
-+        },
-+        {
-+          "case": "sdl",
-+          "type": "546"
-+        },
-+        {
-+          "case": "wav",
-+          "type": "548"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "driver",
-+          "type": "537"
-+        },
-+        {
-+          "name": "timer-period",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[259]",
-+      "element-type": "259",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "259",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "str"
-+        },
-+        {
-+          "name": "slot-type",
-+          "type": "549"
-+        },
-+        {
-+          "name": "source",
-+          "type": "int"
-+        },
-+        {
-+          "name": "status",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "260",
-+      "members": [
-+        {
-+          "name": "info",
-+          "type": "259"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[261]",
-+      "element-type": "261",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "261",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[550]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "262",
-+      "tag": "target",
-+      "variants": [
-+        {
-+          "case": "vcpu",
-+          "type": "553"
-+        },
-+        {
-+          "case": "vm",
-+          "type": "0"
-+        },
-+        {
-+          "case": "cryptodev",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "target",
-+          "type": "551"
-+        },
-+        {
-+          "name": "providers",
-+          "default": null,
-+          "type": "[552]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[263]",
-+      "element-type": "263",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "263",
-+      "members": [
-+        {
-+          "name": "provider",
-+          "type": "554"
-+        },
-+        {
-+          "name": "qom-path",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "stats",
-+          "type": "[555]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "264",
-+      "members": [
-+        {
-+          "name": "provider",
-+          "default": null,
-+          "type": "554"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[265]",
-+      "element-type": "265",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "265",
-+      "members": [
-+        {
-+          "name": "provider",
-+          "type": "554"
-+        },
-+        {
-+          "name": "target",
-+          "type": "551"
-+        },
-+        {
-+          "name": "stats",
-+          "type": "[556]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[266]",
-+      "element-type": "266",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "266",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "267",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "268",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "device-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vhost-started",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "device-endian",
-+          "type": "str"
-+        },
-+        {
-+          "name": "guest-features",
-+          "type": "557"
-+        },
-+        {
-+          "name": "host-features",
-+          "type": "557"
-+        },
-+        {
-+          "name": "backend-features",
-+          "type": "557"
-+        },
-+        {
-+          "name": "num-vqs",
-+          "type": "int"
-+        },
-+        {
-+          "name": "status",
-+          "type": "558"
-+        },
-+        {
-+          "name": "isr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "queue-sel",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vm-running",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "broken",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "disabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "use-started",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "started",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "start-on-kick",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "disable-legacy-check",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "bus-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "use-guest-notifier-mask",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "vhost-dev",
-+          "default": null,
-+          "type": "559"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "269",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "270",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue-index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "inuse",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-num-default",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-align",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-desc",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-avail",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vring-used",
-+          "type": "int"
-+        },
-+        {
-+          "name": "last-avail-idx",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "shadow-avail-idx",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "used-idx",
-+          "type": "int"
-+        },
-+        {
-+          "name": "signalled-used",
-+          "type": "int"
-+        },
-+        {
-+          "name": "signalled-used-valid",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "271",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "272",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "kick",
-+          "type": "int"
-+        },
-+        {
-+          "name": "call",
-+          "type": "int"
-+        },
-+        {
-+          "name": "desc",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avail",
-+          "type": "int"
-+        },
-+        {
-+          "name": "used",
-+          "type": "int"
-+        },
-+        {
-+          "name": "num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "desc-phys",
-+          "type": "int"
-+        },
-+        {
-+          "name": "desc-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avail-phys",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avail-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "used-phys",
-+          "type": "int"
-+        },
-+        {
-+          "name": "used-size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "273",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "type": "int"
-+        },
-+        {
-+          "name": "index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "274",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "descs",
-+          "type": "[560]"
-+        },
-+        {
-+          "name": "avail",
-+          "type": "561"
-+        },
-+        {
-+          "name": "used",
-+          "type": "562"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "275",
-+      "members": [
-+        {
-+          "name": "device-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "qom-path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "device-state",
-+          "type": "563"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[276]",
-+      "element-type": "276",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "276",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "[564]"
-+        },
-+        {
-+          "name": "client",
-+          "type": "[565]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "277",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "log",
-+          "type": "566"
-+        },
-+        {
-+          "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"
-+    },
-+    {
-+      "name": "278",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "log",
-+          "type": "566"
-+        },
-+        {
-+          "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": "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": "279",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "log",
-+          "type": "566"
-+        },
-+        {
-+          "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": "280",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "start",
-+          "type": "int"
-+        },
-+        {
-+          "name": "length",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "281",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "errors",
-+          "type": "[567]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "282",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "568"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "283",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "host-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "selection-policy",
-+          "type": "569"
-+        },
-+        {
-+          "name": "region",
-+          "type": "int"
-+        },
-+        {
-+          "name": "tag",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "extents",
-+          "type": "[570]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "284",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "host-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "removal-policy",
-+          "type": "571"
-+        },
-+        {
-+          "name": "forced-removal",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "sanitize-on-release",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "region",
-+          "type": "int"
-+        },
-+        {
-+          "name": "tag",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "extents",
-+          "type": "[570]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "bool",
-+      "json-type": "boolean",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "285",
-+      "members": [
-+        {
-+          "name": "debug"
-+        },
-+        {
-+          "name": "inmigrate"
-+        },
-+        {
-+          "name": "internal-error"
-+        },
-+        {
-+          "name": "io-error"
-+        },
-+        {
-+          "name": "paused"
-+        },
-+        {
-+          "name": "postmigrate"
-+        },
-+        {
-+          "name": "prelaunch"
-+        },
-+        {
-+          "name": "finish-migrate"
-+        },
-+        {
-+          "name": "restore-vm"
-+        },
-+        {
-+          "name": "running"
-+        },
-+        {
-+          "name": "save-vm"
-+        },
-+        {
-+          "name": "shutdown"
-+        },
-+        {
-+          "name": "suspended"
-+        },
-+        {
-+          "name": "watchdog"
-+        },
-+        {
-+          "name": "guest-panicked"
-+        },
-+        {
-+          "name": "colo"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "debug",
-+        "inmigrate",
-+        "internal-error",
-+        "io-error",
-+        "paused",
-+        "postmigrate",
-+        "prelaunch",
-+        "finish-migrate",
-+        "restore-vm",
-+        "running",
-+        "save-vm",
-+        "shutdown",
-+        "suspended",
-+        "watchdog",
-+        "guest-panicked",
-+        "colo"
-+      ]
-+    },
-+    {
-+      "name": "286",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "host-error"
-+        },
-+        {
-+          "name": "host-qmp-quit"
-+        },
-+        {
-+          "name": "host-qmp-system-reset"
-+        },
-+        {
-+          "name": "host-signal"
-+        },
-+        {
-+          "name": "host-ui"
-+        },
-+        {
-+          "name": "guest-shutdown"
-+        },
-+        {
-+          "name": "guest-reset"
-+        },
-+        {
-+          "name": "guest-panic"
-+        },
-+        {
-+          "name": "subsystem-reset"
-+        },
-+        {
-+          "name": "snapshot-load"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "host-error",
-+        "host-qmp-quit",
-+        "host-qmp-system-reset",
-+        "host-signal",
-+        "host-ui",
-+        "guest-shutdown",
-+        "guest-reset",
-+        "guest-panic",
-+        "subsystem-reset",
-+        "snapshot-load"
-+      ]
-+    },
-+    {
-+      "name": "287",
-+      "members": [
-+        {
-+          "name": "reset"
-+        },
-+        {
-+          "name": "shutdown"
-+        },
-+        {
-+          "name": "poweroff"
-+        },
-+        {
-+          "name": "pause"
-+        },
-+        {
-+          "name": "debug"
-+        },
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "inject-nmi"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "reset",
-+        "shutdown",
-+        "poweroff",
-+        "pause",
-+        "debug",
-+        "none",
-+        "inject-nmi"
-+      ]
-+    },
-+    {
-+      "name": "288",
-+      "members": [
-+        {
-+          "name": "reset"
-+        },
-+        {
-+          "name": "shutdown"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "reset",
-+        "shutdown"
-+      ]
-+    },
-+    {
-+      "name": "289",
-+      "members": [
-+        {
-+          "name": "poweroff"
-+        },
-+        {
-+          "name": "pause"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "poweroff",
-+        "pause"
-+      ]
-+    },
-+    {
-+      "name": "290",
-+      "members": [
-+        {
-+          "name": "pause"
-+        },
-+        {
-+          "name": "shutdown"
-+        },
-+        {
-+          "name": "exit-failure"
-+        },
-+        {
-+          "name": "none"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "pause",
-+        "shutdown",
-+        "exit-failure",
-+        "none"
-+      ]
-+    },
-+    {
-+      "name": "291",
-+      "members": [
-+        {
-+          "name": "pause"
-+        },
-+        {
-+          "name": "poweroff"
-+        },
-+        {
-+          "name": "run"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "pause",
-+        "poweroff",
-+        "run"
-+      ]
-+    },
-+    {
-+      "name": "292",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "hyper-v",
-+          "type": "573"
-+        },
-+        {
-+          "case": "s390",
-+          "type": "574"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "572"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "293",
-+      "members": [
-+        {
-+          "name": "hypervisor"
-+        },
-+        {
-+          "name": "guest"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "hypervisor",
-+        "guest"
-+      ]
-+    },
-+    {
-+      "name": "294",
-+      "members": [
-+        {
-+          "name": "ignore"
-+        },
-+        {
-+          "name": "inject"
-+        },
-+        {
-+          "name": "fatal"
-+        },
-+        {
-+          "name": "reset"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ignore",
-+        "inject",
-+        "fatal",
-+        "reset"
-+      ]
-+    },
-+    {
-+      "name": "295",
-+      "members": [
-+        {
-+          "name": "action-required",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "recursive",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "296",
-+      "members": [
-+        {
-+          "name": "undefined"
-+        },
-+        {
-+          "name": "created"
-+        },
-+        {
-+          "name": "running"
-+        },
-+        {
-+          "name": "paused"
-+        },
-+        {
-+          "name": "ready"
-+        },
-+        {
-+          "name": "standby"
-+        },
-+        {
-+          "name": "waiting"
-+        },
-+        {
-+          "name": "pending"
-+        },
-+        {
-+          "name": "aborting"
-+        },
-+        {
-+          "name": "concluded"
-+        },
-+        {
-+          "name": "null"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "undefined",
-+        "created",
-+        "running",
-+        "paused",
-+        "ready",
-+        "standby",
-+        "waiting",
-+        "pending",
-+        "aborting",
-+        "concluded",
-+        "null"
-+      ]
-+    },
-+    {
-+      "name": "297",
-+      "members": [
-+        {
-+          "name": "commit"
-+        },
-+        {
-+          "name": "stream"
-+        },
-+        {
-+          "name": "mirror"
-+        },
-+        {
-+          "name": "backup"
-+        },
-+        {
-+          "name": "create"
-+        },
-+        {
-+          "name": "amend"
-+        },
-+        {
-+          "name": "snapshot-load"
-+        },
-+        {
-+          "name": "snapshot-save"
-+        },
-+        {
-+          "name": "snapshot-delete"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "commit",
-+        "stream",
-+        "mirror",
-+        "backup",
-+        "create",
-+        "amend",
-+        "snapshot-load",
-+        "snapshot-save",
-+        "snapshot-delete"
-+      ]
-+    },
-+    {
-+      "name": "int",
-+      "json-type": "int",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "298",
-+      "members": [
-+        {
-+          "name": "retain"
-+        },
-+        {
-+          "name": "read-only"
-+        },
-+        {
-+          "name": "read-write"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "retain",
-+        "read-only",
-+        "read-write"
-+      ]
-+    },
-+    {
-+      "name": "[int]",
-+      "element-type": "int",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "299",
-+      "members": [
-+        {
-+          "name": "ok"
-+        },
-+        {
-+          "name": "failed"
-+        },
-+        {
-+          "name": "nospace"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ok",
-+        "failed",
-+        "nospace"
-+      ]
-+    },
-+    {
-+      "name": "300",
-+      "members": [
-+        {
-+          "name": "rd_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "zone_append_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "unmap_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "zone_append_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "unmap_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "zone_append_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flush_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "unmap_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_highest_offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_merged",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_merged",
-+          "type": "int"
-+        },
-+        {
-+          "name": "zone_append_merged",
-+          "type": "int"
-+        },
-+        {
-+          "name": "unmap_merged",
-+          "type": "int"
-+        },
-+        {
-+          "name": "idle_time_ns",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "failed_rd_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "failed_wr_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "failed_zone_append_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "failed_flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "failed_unmap_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_rd_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_wr_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_zone_append_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_unmap_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "account_invalid",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "account_failed",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "timed_stats",
-+          "type": "[575]"
-+        },
-+        {
-+          "name": "rd_latency_histogram",
-+          "default": null,
-+          "type": "576"
-+        },
-+        {
-+          "name": "wr_latency_histogram",
-+          "default": null,
-+          "type": "576"
-+        },
-+        {
-+          "name": "zone_append_latency_histogram",
-+          "default": null,
-+          "type": "576"
-+        },
-+        {
-+          "name": "flush_latency_histogram",
-+          "default": null,
-+          "type": "576"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "301",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "file",
-+          "type": "577"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "577"
-+        },
-+        {
-+          "case": "nvme",
-+          "type": "578"
-+        },
-+        {
-+          "case": "blkdebug",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blklogwrites",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkreplay",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "0"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "0"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "0"
-+        },
-+        {
-+          "case": "compress",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-before-write",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "0"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-access",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftps",
-+          "type": "0"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "0"
-+        },
-+        {
-+          "case": "host_cdrom",
-+          "type": "0"
-+        },
-+        {
-+          "case": "http",
-+          "type": "0"
-+        },
-+        {
-+          "case": "https",
-+          "type": "0"
-+        },
-+        {
-+          "case": "io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "iscsi",
-+          "type": "0"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nvme-io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "parallels",
-+          "type": "0"
-+        },
-+        {
-+          "case": "preallocate",
-+          "type": "0"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "0"
-+        },
-+        {
-+          "case": "qcow2",
-+          "type": "0"
-+        },
-+        {
-+          "case": "qed",
-+          "type": "0"
-+        },
-+        {
-+          "case": "quorum",
-+          "type": "0"
-+        },
-+        {
-+          "case": "raw",
-+          "type": "0"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "0"
-+        },
-+        {
-+          "case": "replication",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ssh",
-+          "type": "0"
-+        },
-+        {
-+          "case": "throttle",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vdi",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vfio-pci",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-user",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-vdpa",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vvfat",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "317"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "302",
-+      "members": [
-+        {
-+          "name": "actively-synced",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "303",
-+      "members": [
-+        {
-+          "name": "existing"
-+        },
-+        {
-+          "name": "absolute-paths"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "existing",
-+        "absolute-paths"
-+      ]
-+    },
-+    {
-+      "name": "304",
-+      "members": [
-+        {
-+          "name": "report"
-+        },
-+        {
-+          "name": "ignore"
-+        },
-+        {
-+          "name": "enospc"
-+        },
-+        {
-+          "name": "stop"
-+        },
-+        {
-+          "name": "auto"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "report",
-+        "ignore",
-+        "enospc",
-+        "stop",
-+        "auto"
-+      ]
-+    },
-+    {
-+      "name": "305",
-+      "members": [
-+        {
-+          "name": "top"
-+        },
-+        {
-+          "name": "full"
-+        },
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "incremental"
-+        },
-+        {
-+          "name": "bitmap"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "top",
-+        "full",
-+        "none",
-+        "incremental",
-+        "bitmap"
-+      ]
-+    },
-+    {
-+      "name": "306",
-+      "members": [
-+        {
-+          "name": "on-success"
-+        },
-+        {
-+          "name": "never"
-+        },
-+        {
-+          "name": "always"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "on-success",
-+        "never",
-+        "always"
-+      ]
-+    },
-+    {
-+      "name": "307",
-+      "members": [
-+        {
-+          "name": "use-copy-range",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "max-workers",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-chunk",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "min-cluster-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "308",
-+      "members": [
-+        {
-+          "name": "off"
-+        },
-+        {
-+          "name": "on"
-+        },
-+        {
-+          "name": "unmap"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on",
-+        "unmap"
-+      ]
-+    },
-+    {
-+      "name": "309",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "type": "str"
-+        },
-+        {
-+          "name": "dirty-flag",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "actual-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "virtual-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypted",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "compressed",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "backing-filename",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "full-backing-filename",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-filename-format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "snapshots",
-+          "default": null,
-+          "type": "[78]"
-+        },
-+        {
-+          "name": "format-specific",
-+          "default": null,
-+          "type": "579"
-+        },
-+        {
-+          "name": "backing-image",
-+          "default": null,
-+          "type": "309"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "310",
-+      "members": [
-+        {
-+          "name": "writeback",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "direct",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "no-flush",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[311]",
-+      "element-type": "311",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "311",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "granularity",
-+          "type": "int"
-+        },
-+        {
-+          "name": "recording",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "busy",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "persistent",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "inconsistent",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[312]",
-+      "element-type": "312",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "312",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "type",
-+          "type": "580"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[313]",
-+      "element-type": "313",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "313",
-+      "members": [
-+        {
-+          "name": "parent",
-+          "type": "int"
-+        },
-+        {
-+          "name": "child",
-+          "type": "int"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "perm",
-+          "type": "[581]"
-+        },
-+        {
-+          "name": "shared-perm",
-+          "type": "[581]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "314",
-+      "members": [
-+        {
-+          "name": "background"
-+        },
-+        {
-+          "name": "write-blocking"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "background",
-+        "write-blocking"
-+      ]
-+    },
-+    {
-+      "name": "[315]",
-+      "element-type": "315",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "315",
-+      "members": [
-+        {
-+          "type": "str"
-+        },
-+        {
-+          "type": "45"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "316",
-+      "members": [
-+        {
-+          "name": "copy-mode",
-+          "type": "314"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "317",
-+      "members": [
-+        {
-+          "name": "blkdebug"
-+        },
-+        {
-+          "name": "blklogwrites"
-+        },
-+        {
-+          "name": "blkreplay"
-+        },
-+        {
-+          "name": "blkverify"
-+        },
-+        {
-+          "name": "bochs"
-+        },
-+        {
-+          "name": "cloop"
-+        },
-+        {
-+          "name": "compress"
-+        },
-+        {
-+          "name": "copy-before-write"
-+        },
-+        {
-+          "name": "copy-on-read"
-+        },
-+        {
-+          "name": "dmg"
-+        },
-+        {
-+          "name": "file"
-+        },
-+        {
-+          "name": "snapshot-access"
-+        },
-+        {
-+          "name": "ftp"
-+        },
-+        {
-+          "name": "ftps"
-+        },
-+        {
-+          "name": "gluster",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "host_cdrom"
-+        },
-+        {
-+          "name": "host_device"
-+        },
-+        {
-+          "name": "http"
-+        },
-+        {
-+          "name": "https"
-+        },
-+        {
-+          "name": "io_uring"
-+        },
-+        {
-+          "name": "iscsi"
-+        },
-+        {
-+          "name": "luks"
-+        },
-+        {
-+          "name": "nbd"
-+        },
-+        {
-+          "name": "nfs"
-+        },
-+        {
-+          "name": "null-aio"
-+        },
-+        {
-+          "name": "null-co"
-+        },
-+        {
-+          "name": "nvme"
-+        },
-+        {
-+          "name": "nvme-io_uring"
-+        },
-+        {
-+          "name": "parallels"
-+        },
-+        {
-+          "name": "preallocate"
-+        },
-+        {
-+          "name": "qcow"
-+        },
-+        {
-+          "name": "qcow2"
-+        },
-+        {
-+          "name": "qed"
-+        },
-+        {
-+          "name": "quorum"
-+        },
-+        {
-+          "name": "raw"
-+        },
-+        {
-+          "name": "rbd"
-+        },
-+        {
-+          "name": "replication"
-+        },
-+        {
-+          "name": "ssh"
-+        },
-+        {
-+          "name": "throttle"
-+        },
-+        {
-+          "name": "vdi"
-+        },
-+        {
-+          "name": "vhdx"
-+        },
-+        {
-+          "name": "virtio-blk-vfio-pci"
-+        },
-+        {
-+          "name": "virtio-blk-vhost-user"
-+        },
-+        {
-+          "name": "virtio-blk-vhost-vdpa"
-+        },
-+        {
-+          "name": "vmdk"
-+        },
-+        {
-+          "name": "vpc"
-+        },
-+        {
-+          "name": "vvfat"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "blkdebug",
-+        "blklogwrites",
-+        "blkreplay",
-+        "blkverify",
-+        "bochs",
-+        "cloop",
-+        "compress",
-+        "copy-before-write",
-+        "copy-on-read",
-+        "dmg",
-+        "file",
-+        "snapshot-access",
-+        "ftp",
-+        "ftps",
-+        "gluster",
-+        "host_cdrom",
-+        "host_device",
-+        "http",
-+        "https",
-+        "io_uring",
-+        "iscsi",
-+        "luks",
-+        "nbd",
-+        "nfs",
-+        "null-aio",
-+        "null-co",
-+        "nvme",
-+        "nvme-io_uring",
-+        "parallels",
-+        "preallocate",
-+        "qcow",
-+        "qcow2",
-+        "qed",
-+        "quorum",
-+        "raw",
-+        "rbd",
-+        "replication",
-+        "ssh",
-+        "throttle",
-+        "vdi",
-+        "vhdx",
-+        "virtio-blk-vfio-pci",
-+        "virtio-blk-vhost-user",
-+        "virtio-blk-vhost-vdpa",
-+        "vmdk",
-+        "vpc",
-+        "vvfat"
-+      ]
-+    },
-+    {
-+      "name": "318",
-+      "members": [
-+        {
-+          "name": "ignore"
-+        },
-+        {
-+          "name": "unmap"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ignore",
-+        "unmap"
-+      ]
-+    },
-+    {
-+      "name": "319",
-+      "members": [
-+        {
-+          "name": "direct",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "no-flush",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "320",
-+      "members": [
-+        {
-+          "name": "image",
-+          "type": "582"
-+        },
-+        {
-+          "name": "config",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "align",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-transfer",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "opt-write-zero",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-write-zero",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "opt-discard",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-discard",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "inject-error",
-+          "default": null,
-+          "type": "[583]"
-+        },
-+        {
-+          "name": "set-state",
-+          "default": null,
-+          "type": "[584]"
-+        },
-+        {
-+          "name": "take-child-perms",
-+          "default": null,
-+          "type": "[581]"
-+        },
-+        {
-+          "name": "unshare-child-perms",
-+          "default": null,
-+          "type": "[581]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "321",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "log",
-+          "type": "582"
-+        },
-+        {
-+          "name": "log-sector-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "log-append",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "log-super-update-interval",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "322",
-+      "members": [
-+        {
-+          "name": "test",
-+          "type": "582"
-+        },
-+        {
-+          "name": "raw",
-+          "type": "582"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "323",
-+      "members": [
-+        {
-+          "name": "image",
-+          "type": "582"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "324",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "325",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "target",
-+          "type": "582"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "45"
-+        },
-+        {
-+          "name": "on-cbw-error",
-+          "default": null,
-+          "type": "585"
-+        },
-+        {
-+          "name": "cbw-timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "min-cluster-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "326",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "bottom",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "327",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "pr-manager",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "locking",
-+          "default": null,
-+          "type": "586"
-+        },
-+        {
-+          "name": "aio",
-+          "default": null,
-+          "type": "587"
-+        },
-+        {
-+          "name": "aio-max-batch",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "drop-cache",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-check-cache-dropped",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object",
-+      "features": [
-+        "dynamic-auto-read-only"
-+      ]
-+    },
-+    {
-+      "name": "328",
-+      "members": [
-+        {
-+          "name": "url",
-+          "type": "str"
-+        },
-+        {
-+          "name": "readahead",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-password-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "329",
-+      "members": [
-+        {
-+          "name": "url",
-+          "type": "str"
-+        },
-+        {
-+          "name": "readahead",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sslverify",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "330",
-+      "members": [
-+        {
-+          "name": "volume",
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "type": "[391]"
-+        },
-+        {
-+          "name": "debug",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "331",
-+      "members": [
-+        {
-+          "name": "url",
-+          "type": "str"
-+        },
-+        {
-+          "name": "readahead",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cookie",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cookie-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "332",
-+      "members": [
-+        {
-+          "name": "url",
-+          "type": "str"
-+        },
-+        {
-+          "name": "readahead",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-username",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "proxy-password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cookie",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sslverify",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "cookie-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "333",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "334",
-+      "members": [
-+        {
-+          "name": "transport",
-+          "type": "588"
-+        },
-+        {
-+          "name": "portal",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "lun",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "initiator-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "header-digest",
-+          "default": null,
-+          "type": "589"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "335",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "header",
-+          "default": null,
-+          "type": "582"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "336",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "391"
-+        },
-+        {
-+          "name": "export",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-hostname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "x-dirty-bitmap",
-+          "default": null,
-+          "type": "str",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "reconnect-delay",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "open-timeout",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "337",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "590"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tcp-syn-count",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "readahead-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "page-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "debug",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "338",
-+      "members": [
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "latency-ns",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "read-zeroes",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "339",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "namespace",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "340",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "341",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "prealloc-align",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "342",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "591"
-+        },
-+        {
-+          "name": "lazy-refcounts",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "pass-discard-request",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "pass-discard-snapshot",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "pass-discard-other",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "discard-no-unref",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "overlap-check",
-+          "default": null,
-+          "type": "592"
-+        },
-+        {
-+          "name": "cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "l2-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "l2-cache-entry-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "refcount-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cache-clean-interval",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "593"
-+        },
-+        {
-+          "name": "data-file",
-+          "default": null,
-+          "type": "582"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "343",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "591"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "594"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "344",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "591"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "345",
-+      "members": [
-+        {
-+          "name": "blkverify",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "children",
-+          "type": "[582]"
-+        },
-+        {
-+          "name": "vote-threshold",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rewrite-corrupted",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "read-pattern",
-+          "default": null,
-+          "type": "595"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "346",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "offset",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "347",
-+      "members": [
-+        {
-+          "name": "pool",
-+          "type": "str"
-+        },
-+        {
-+          "name": "namespace",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "image",
-+          "type": "str"
-+        },
-+        {
-+          "name": "conf",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "snapshot",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "596"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "auth-client-required",
-+          "default": null,
-+          "type": "[597]"
-+        },
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "[598]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "348",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "mode",
-+          "type": "599"
-+        },
-+        {
-+          "name": "top-id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "349",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "600"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "host-key-check",
-+          "default": null,
-+          "type": "601"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "350",
-+      "members": [
-+        {
-+          "name": "throttle-group",
-+          "type": "str"
-+        },
-+        {
-+          "name": "file",
-+          "type": "582"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "351",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "352",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "353",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object",
-+      "features": [
-+        "fdset"
-+      ]
-+    },
-+    {
-+      "name": "354",
-+      "members": [
-+        {
-+          "name": "dir",
-+          "type": "str"
-+        },
-+        {
-+          "name": "fat-type",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "floppy",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "label",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "rw",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[58]",
-+      "element-type": "58",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "355",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "file",
-+          "type": "602"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "603"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "604"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "605"
-+        },
-+        {
-+          "case": "parallels",
-+          "type": "606"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "607"
-+        },
-+        {
-+          "case": "qcow2",
-+          "type": "608"
-+        },
-+        {
-+          "case": "qed",
-+          "type": "609"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "610"
-+        },
-+        {
-+          "case": "ssh",
-+          "type": "611"
-+        },
-+        {
-+          "case": "vdi",
-+          "type": "612"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "613"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "614"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "615"
-+        },
-+        {
-+          "case": "blkdebug",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blklogwrites",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkreplay",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "0"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "0"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "0"
-+        },
-+        {
-+          "case": "compress",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-before-write",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "0"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-access",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftps",
-+          "type": "0"
-+        },
-+        {
-+          "case": "host_cdrom",
-+          "type": "0"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "0"
-+        },
-+        {
-+          "case": "http",
-+          "type": "0"
-+        },
-+        {
-+          "case": "https",
-+          "type": "0"
-+        },
-+        {
-+          "case": "io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "iscsi",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nvme",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nvme-io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "preallocate",
-+          "type": "0"
-+        },
-+        {
-+          "case": "quorum",
-+          "type": "0"
-+        },
-+        {
-+          "case": "raw",
-+          "type": "0"
-+        },
-+        {
-+          "case": "replication",
-+          "type": "0"
-+        },
-+        {
-+          "case": "throttle",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vfio-pci",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-user",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-vdpa",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vvfat",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "317"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "356",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "luks",
-+          "type": "616"
-+        },
-+        {
-+          "case": "qcow2",
-+          "type": "617"
-+        },
-+        {
-+          "case": "blkdebug",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blklogwrites",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkreplay",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "0"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "0"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "0"
-+        },
-+        {
-+          "case": "compress",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-before-write",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "0"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "0"
-+        },
-+        {
-+          "case": "file",
-+          "type": "0"
-+        },
-+        {
-+          "case": "snapshot-access",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ftps",
-+          "type": "0"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "0"
-+        },
-+        {
-+          "case": "host_cdrom",
-+          "type": "0"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "0"
-+        },
-+        {
-+          "case": "http",
-+          "type": "0"
-+        },
-+        {
-+          "case": "https",
-+          "type": "0"
-+        },
-+        {
-+          "case": "io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "iscsi",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nvme",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nvme-io_uring",
-+          "type": "0"
-+        },
-+        {
-+          "case": "parallels",
-+          "type": "0"
-+        },
-+        {
-+          "case": "preallocate",
-+          "type": "0"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "0"
-+        },
-+        {
-+          "case": "qed",
-+          "type": "0"
-+        },
-+        {
-+          "case": "quorum",
-+          "type": "0"
-+        },
-+        {
-+          "case": "raw",
-+          "type": "0"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "0"
-+        },
-+        {
-+          "case": "replication",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ssh",
-+          "type": "0"
-+        },
-+        {
-+          "case": "throttle",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vdi",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vfio-pci",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-user",
-+          "type": "0"
-+        },
-+        {
-+          "case": "virtio-blk-vhost-vdpa",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vvfat",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "317"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "357",
-+      "members": [
-+        {
-+          "name": "read"
-+        },
-+        {
-+          "name": "write"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "read",
-+        "write"
-+      ]
-+    },
-+    {
-+      "name": "358",
-+      "members": [
-+        {
-+          "name": "ignore"
-+        },
-+        {
-+          "name": "report"
-+        },
-+        {
-+          "name": "stop"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ignore",
-+        "report",
-+        "stop"
-+      ]
-+    },
-+    {
-+      "name": "359",
-+      "members": [
-+        {
-+          "type": "str"
-+        },
-+        {
-+          "type": "null"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "360",
-+      "members": [
-+        {
-+          "name": "read"
-+        },
-+        {
-+          "name": "write"
-+        },
-+        {
-+          "name": "flush"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "read",
-+        "write",
-+        "flush"
-+      ]
-+    },
-+    {
-+      "name": "361",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "inet",
-+          "type": "619"
-+        },
-+        {
-+          "case": "unix",
-+          "type": "620"
-+        },
-+        {
-+          "case": "vsock",
-+          "type": "621"
-+        },
-+        {
-+          "case": "fd",
-+          "type": "622"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "618"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "362",
-+      "members": [
-+        {
-+          "name": "safe"
-+        },
-+        {
-+          "name": "hard"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "safe",
-+        "hard"
-+      ]
-+    },
-+    {
-+      "name": "363",
-+      "members": [
-+        {
-+          "name": "nbd"
-+        },
-+        {
-+          "name": "vhost-user-blk"
-+        },
-+        {
-+          "name": "fuse"
-+        },
-+        {
-+          "name": "vduse-blk"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "nbd",
-+        "vhost-user-blk",
-+        "fuse",
-+        "vduse-blk"
-+      ]
-+    },
-+    {
-+      "name": "364",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "description",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmaps",
-+          "default": null,
-+          "type": "[315]"
-+        },
-+        {
-+          "name": "allocation-depth",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "365",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "391"
-+        },
-+        {
-+          "name": "logical-block-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "num-queues",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "366",
-+      "members": [
-+        {
-+          "name": "mountpoint",
-+          "type": "str"
-+        },
-+        {
-+          "name": "growable",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "allow-other",
-+          "default": null,
-+          "type": "623"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "367",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "num-queues",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "queue-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "logical-block-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "serial",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "368",
-+      "members": [
-+        {
-+          "name": "utf8"
-+        },
-+        {
-+          "name": "base64"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "utf8",
-+        "base64"
-+      ]
-+    },
-+    {
-+      "name": "369",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "file",
-+          "type": "625"
-+        },
-+        {
-+          "case": "serial",
-+          "type": "626"
-+        },
-+        {
-+          "case": "parallel",
-+          "type": "626"
-+        },
-+        {
-+          "case": "pipe",
-+          "type": "626"
-+        },
-+        {
-+          "case": "socket",
-+          "type": "627"
-+        },
-+        {
-+          "case": "udp",
-+          "type": "628"
-+        },
-+        {
-+          "case": "pty",
-+          "type": "629"
-+        },
-+        {
-+          "case": "null",
-+          "type": "630"
-+        },
-+        {
-+          "case": "mux",
-+          "type": "631"
-+        },
-+        {
-+          "case": "msmouse",
-+          "type": "630"
-+        },
-+        {
-+          "case": "wctablet",
-+          "type": "630"
-+        },
-+        {
-+          "case": "braille",
-+          "type": "630"
-+        },
-+        {
-+          "case": "testdev",
-+          "type": "630"
-+        },
-+        {
-+          "case": "stdio",
-+          "type": "632"
-+        },
-+        {
-+          "case": "dbus",
-+          "type": "636"
-+        },
-+        {
-+          "case": "vc",
-+          "type": "637"
-+        },
-+        {
-+          "case": "ringbuf",
-+          "type": "638"
-+        },
-+        {
-+          "case": "memory",
-+          "type": "638"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "624"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "370",
-+      "members": [
-+        {
-+          "name": "elf"
-+        },
-+        {
-+          "name": "kdump-zlib"
-+        },
-+        {
-+          "name": "kdump-lzo"
-+        },
-+        {
-+          "name": "kdump-snappy"
-+        },
-+        {
-+          "name": "kdump-raw-zlib"
-+        },
-+        {
-+          "name": "kdump-raw-lzo"
-+        },
-+        {
-+          "name": "kdump-raw-snappy"
-+        },
-+        {
-+          "name": "win-dmp"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "elf",
-+        "kdump-zlib",
-+        "kdump-lzo",
-+        "kdump-snappy",
-+        "kdump-raw-zlib",
-+        "kdump-raw-lzo",
-+        "kdump-raw-snappy",
-+        "win-dmp"
-+      ]
-+    },
-+    {
-+      "name": "371",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "active"
-+        },
-+        {
-+          "name": "completed"
-+        },
-+        {
-+          "name": "failed"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "active",
-+        "completed",
-+        "failed"
-+      ]
-+    },
-+    {
-+      "name": "[370]",
-+      "element-type": "370",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "372",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "nic"
-+        },
-+        {
-+          "name": "user"
-+        },
-+        {
-+          "name": "tap"
-+        },
-+        {
-+          "name": "l2tpv3"
-+        },
-+        {
-+          "name": "socket"
-+        },
-+        {
-+          "name": "stream"
-+        },
-+        {
-+          "name": "dgram"
-+        },
-+        {
-+          "name": "vde"
-+        },
-+        {
-+          "name": "bridge"
-+        },
-+        {
-+          "name": "hubport"
-+        },
-+        {
-+          "name": "netmap"
-+        },
-+        {
-+          "name": "vhost-user"
-+        },
-+        {
-+          "name": "vhost-vdpa"
-+        },
-+        {
-+          "name": "af-xdp"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "nic",
-+        "user",
-+        "tap",
-+        "l2tpv3",
-+        "socket",
-+        "stream",
-+        "dgram",
-+        "vde",
-+        "bridge",
-+        "hubport",
-+        "netmap",
-+        "vhost-user",
-+        "vhost-vdpa",
-+        "af-xdp"
-+      ]
-+    },
-+    {
-+      "name": "373",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "macaddr",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "model",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "addr",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vectors",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "374",
-+      "members": [
-+        {
-+          "name": "hostname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "restrict",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ipv4",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ipv6",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ip",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "net",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "host",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tftp",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "bootfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "dhcpstart",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "dns",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "dnssearch",
-+          "default": null,
-+          "type": "[639]"
-+        },
-+        {
-+          "name": "domainname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ipv6-prefix",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ipv6-prefixlen",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "ipv6-host",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ipv6-dns",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "smb",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "smbserver",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "hostfwd",
-+          "default": null,
-+          "type": "[639]"
-+        },
-+        {
-+          "name": "guestfwd",
-+          "default": null,
-+          "type": "[639]"
-+        },
-+        {
-+          "name": "tftp-server-name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "375",
-+      "members": [
-+        {
-+          "name": "ifname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "fds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "script",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "downscript",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "br",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "helper",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sndbuf",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "vnet_hdr",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "vhost",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "vhostfd",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vhostfds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vhostforce",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "queues",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-us",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "376",
-+      "members": [
-+        {
-+          "name": "src",
-+          "type": "str"
-+        },
-+        {
-+          "name": "dst",
-+          "type": "str"
-+        },
-+        {
-+          "name": "srcport",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "dstport",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ipv6",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "udp",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "cookie64",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "counter",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "pincounter",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "txcookie",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "rxcookie",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "txsession",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rxsession",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "377",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "listen",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "connect",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "mcast",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "localaddr",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "udp",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "378",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "391"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reconnect",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "reconnect-ms",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "379",
-+      "members": [
-+        {
-+          "name": "local",
-+          "default": null,
-+          "type": "391"
-+        },
-+        {
-+          "name": "remote",
-+          "default": null,
-+          "type": "391"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "380",
-+      "members": [
-+        {
-+          "name": "sock",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "381",
-+      "members": [
-+        {
-+          "name": "br",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "helper",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "382",
-+      "members": [
-+        {
-+          "name": "hubid",
-+          "type": "int"
-+        },
-+        {
-+          "name": "netdev",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "383",
-+      "members": [
-+        {
-+          "name": "ifname",
-+          "type": "str"
-+        },
-+        {
-+          "name": "devname",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "384",
-+      "members": [
-+        {
-+          "name": "ifname",
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "640"
-+        },
-+        {
-+          "name": "force-copy",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "queues",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "start-queue",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "inhibit",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "sock-fds",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "385",
-+      "members": [
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vhostforce",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "queues",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "386",
-+      "members": [
-+        {
-+          "name": "vhostdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vhostfd",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "queues",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-svq",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "390",
-+      "members": [
-+        {
-+          "name": "normal"
-+        },
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "all"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "normal",
-+        "none",
-+        "all"
-+      ]
-+    },
-+    {
-+      "name": "[str]",
-+      "element-type": "str",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "391",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "inet",
-+          "type": "600"
-+        },
-+        {
-+          "case": "unix",
-+          "type": "641"
-+        },
-+        {
-+          "case": "vsock",
-+          "type": "642"
-+        },
-+        {
-+          "case": "fd",
-+          "type": "643"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "618"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "392",
-+      "members": [
-+        {
-+          "name": "rss"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "rss"
-+      ]
-+    },
-+    {
-+      "name": "393",
-+      "members": [
-+        {
-+          "name": "half"
-+        },
-+        {
-+          "name": "full"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "half",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "394",
-+      "members": [
-+        {
-+          "name": "off"
-+        },
-+        {
-+          "name": "on"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on"
-+      ]
-+    },
-+    {
-+      "name": "395",
-+      "members": [
-+        {
-+          "name": "priority",
-+          "type": "int"
-+        },
-+        {
-+          "name": "tbl-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "in-pport",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tunnel-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "eth-type",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "eth-src",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "eth-dst",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ip-proto",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "ip-tos",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "ip-dst",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "396",
-+      "members": [
-+        {
-+          "name": "in-pport",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tunnel-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "eth-src",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "eth-dst",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "ip-proto",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "ip-tos",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "397",
-+      "members": [
-+        {
-+          "name": "goto-tbl",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "group-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tunnel-lport",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "new-vlan-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "out-pport",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "398",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "passthrough",
-+          "type": "644"
-+        },
-+        {
-+          "case": "emulator",
-+          "type": "645"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "121"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "399",
-+      "members": [
-+        {
-+          "name": "vnc"
-+        },
-+        {
-+          "name": "spice"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "vnc",
-+        "spice"
-+      ]
-+    },
-+    {
-+      "name": "400",
-+      "members": [
-+        {
-+          "name": "keep"
-+        },
-+        {
-+          "name": "fail"
-+        },
-+        {
-+          "name": "disconnect"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "keep",
-+        "fail",
-+        "disconnect"
-+      ]
-+    },
-+    {
-+      "name": "401",
-+      "members": [
-+        {
-+          "name": "display",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "402",
-+      "members": [
-+        {
-+          "name": "display",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "403",
-+      "members": [
-+        {
-+          "name": "ppm"
-+        },
-+        {
-+          "name": "png"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ppm",
-+        "png"
-+      ]
-+    },
-+    {
-+      "name": "408",
-+      "members": [
-+        {
-+          "name": "ipv4"
-+        },
-+        {
-+          "name": "ipv6"
-+        },
-+        {
-+          "name": "unix"
-+        },
-+        {
-+          "name": "vsock"
-+        },
-+        {
-+          "name": "unknown"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ipv4",
-+        "ipv6",
-+        "unix",
-+        "vsock",
-+        "unknown"
-+      ]
-+    },
-+    {
-+      "name": "[409]",
-+      "element-type": "409",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "409",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "408"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x509_dname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sasl_username",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[410]",
-+      "element-type": "410",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "410",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "408"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auth",
-+          "type": "411"
-+        },
-+        {
-+          "name": "vencrypt",
-+          "default": null,
-+          "type": "412"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "411",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "vnc"
-+        },
-+        {
-+          "name": "ra2"
-+        },
-+        {
-+          "name": "ra2ne"
-+        },
-+        {
-+          "name": "tight"
-+        },
-+        {
-+          "name": "ultra"
-+        },
-+        {
-+          "name": "tls"
-+        },
-+        {
-+          "name": "vencrypt"
-+        },
-+        {
-+          "name": "sasl"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "vnc",
-+        "ra2",
-+        "ra2ne",
-+        "tight",
-+        "ultra",
-+        "tls",
-+        "vencrypt",
-+        "sasl"
-+      ]
-+    },
-+    {
-+      "name": "412",
-+      "members": [
-+        {
-+          "name": "plain"
-+        },
-+        {
-+          "name": "tls-none"
-+        },
-+        {
-+          "name": "x509-none"
-+        },
-+        {
-+          "name": "tls-vnc"
-+        },
-+        {
-+          "name": "x509-vnc"
-+        },
-+        {
-+          "name": "tls-plain"
-+        },
-+        {
-+          "name": "x509-plain"
-+        },
-+        {
-+          "name": "tls-sasl"
-+        },
-+        {
-+          "name": "x509-sasl"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "plain",
-+        "tls-none",
-+        "x509-none",
-+        "tls-vnc",
-+        "x509-vnc",
-+        "tls-plain",
-+        "x509-plain",
-+        "tls-sasl",
-+        "x509-sasl"
-+      ]
-+    },
-+    {
-+      "name": "413",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "408"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "414",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "408"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[415]",
-+      "element-type": "415",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "415",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "number",
-+          "type": "647"
-+        },
-+        {
-+          "case": "qcode",
-+          "type": "648"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "646"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[416]",
-+      "element-type": "416",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "416",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "key",
-+          "type": "650"
-+        },
-+        {
-+          "case": "btn",
-+          "type": "651"
-+        },
-+        {
-+          "case": "rel",
-+          "type": "652"
-+        },
-+        {
-+          "case": "abs",
-+          "type": "652"
-+        },
-+        {
-+          "case": "mtt",
-+          "type": "653"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "649"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "417",
-+      "members": [
-+        {
-+          "name": "default"
-+        },
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "gtk"
-+        },
-+        {
-+          "name": "sdl"
-+        },
-+        {
-+          "name": "egl-headless"
-+        },
-+        {
-+          "name": "curses"
-+        },
-+        {
-+          "name": "dbus"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "default",
-+        "none",
-+        "gtk",
-+        "sdl",
-+        "egl-headless",
-+        "curses",
-+        "dbus"
-+      ]
-+    },
-+    {
-+      "name": "418",
-+      "members": [
-+        {
-+          "name": "off"
-+        },
-+        {
-+          "name": "on"
-+        },
-+        {
-+          "name": "core"
-+        },
-+        {
-+          "name": "es"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on",
-+        "core",
-+        "es"
-+      ]
-+    },
-+    {
-+      "name": "419",
-+      "members": [
-+        {
-+          "name": "grab-on-hover",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "zoom-to-fit",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "show-tabs",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "show-menubar",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "420",
-+      "members": [
-+        {
-+          "name": "left-command-key",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "full-grab",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "swap-opt-cmd",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "zoom-to-fit",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "zoom-interpolation",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "421",
-+      "members": [
-+        {
-+          "name": "charset",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "422",
-+      "members": [
-+        {
-+          "name": "rendernode",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "423",
-+      "members": [
-+        {
-+          "name": "rendernode",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "addr",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "p2p",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "audiodev",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "424",
-+      "members": [
-+        {
-+          "name": "grab-mod",
-+          "default": null,
-+          "type": "654"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "425",
-+      "members": [
-+        {
-+          "name": "vnc"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "vnc"
-+      ]
-+    },
-+    {
-+      "name": "426",
-+      "members": [
-+        {
-+          "name": "tls-certs",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "427",
-+      "members": [
-+        {
-+          "name": "vnc"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "vnc"
-+      ]
-+    },
-+    {
-+      "name": "428",
-+      "members": [
-+        {
-+          "name": "addresses",
-+          "default": null,
-+          "type": "[391]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "429",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "setup"
-+        },
-+        {
-+          "name": "cancelling"
-+        },
-+        {
-+          "name": "cancelled"
-+        },
-+        {
-+          "name": "active"
-+        },
-+        {
-+          "name": "postcopy-active"
-+        },
-+        {
-+          "name": "postcopy-paused"
-+        },
-+        {
-+          "name": "postcopy-recover-setup"
-+        },
-+        {
-+          "name": "postcopy-recover"
-+        },
-+        {
-+          "name": "completed"
-+        },
-+        {
-+          "name": "failed"
-+        },
-+        {
-+          "name": "colo"
-+        },
-+        {
-+          "name": "pre-switchover"
-+        },
-+        {
-+          "name": "device"
-+        },
-+        {
-+          "name": "wait-unplug"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "setup",
-+        "cancelling",
-+        "cancelled",
-+        "active",
-+        "postcopy-active",
-+        "postcopy-paused",
-+        "postcopy-recover-setup",
-+        "postcopy-recover",
-+        "completed",
-+        "failed",
-+        "colo",
-+        "pre-switchover",
-+        "device",
-+        "wait-unplug"
-+      ]
-+    },
-+    {
-+      "name": "430",
-+      "members": [
-+        {
-+          "name": "transferred",
-+          "type": "int"
-+        },
-+        {
-+          "name": "remaining",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total",
-+          "type": "int"
-+        },
-+        {
-+          "name": "duplicate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "normal",
-+          "type": "int"
-+        },
-+        {
-+          "name": "normal-bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-pages-rate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "mbps",
-+          "type": "number"
-+        },
-+        {
-+          "name": "dirty-sync-count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "postcopy-requests",
-+          "type": "int"
-+        },
-+        {
-+          "name": "page-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "multifd-bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "pages-per-second",
-+          "type": "int"
-+        },
-+        {
-+          "name": "precopy-bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime-bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "postcopy-bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-sync-missed-zero-copy",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "431",
-+      "members": [
-+        {
-+          "name": "transferred",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "432",
-+      "members": [
-+        {
-+          "name": "cache-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "pages",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cache-miss",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cache-miss-rate",
-+          "type": "number"
-+        },
-+        {
-+          "name": "encoding-rate",
-+          "type": "number"
-+        },
-+        {
-+          "name": "overflow",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[391]",
-+      "element-type": "391",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "433",
-+      "members": [
-+        {
-+          "name": "xbzrle"
-+        },
-+        {
-+          "name": "rdma-pin-all"
-+        },
-+        {
-+          "name": "auto-converge"
-+        },
-+        {
-+          "name": "zero-blocks",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "events"
-+        },
-+        {
-+          "name": "postcopy-ram"
-+        },
-+        {
-+          "name": "x-colo",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "release-ram"
-+        },
-+        {
-+          "name": "return-path"
-+        },
-+        {
-+          "name": "pause-before-switchover"
-+        },
-+        {
-+          "name": "multifd"
-+        },
-+        {
-+          "name": "dirty-bitmaps"
-+        },
-+        {
-+          "name": "postcopy-blocktime"
-+        },
-+        {
-+          "name": "late-block-activate"
-+        },
-+        {
-+          "name": "x-ignore-shared",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "validate-uuid"
-+        },
-+        {
-+          "name": "background-snapshot"
-+        },
-+        {
-+          "name": "zero-copy-send"
-+        },
-+        {
-+          "name": "postcopy-preempt"
-+        },
-+        {
-+          "name": "switchover-ack"
-+        },
-+        {
-+          "name": "dirty-limit"
-+        },
-+        {
-+          "name": "mapped-ram"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "xbzrle",
-+        "rdma-pin-all",
-+        "auto-converge",
-+        "zero-blocks",
-+        "events",
-+        "postcopy-ram",
-+        "x-colo",
-+        "release-ram",
-+        "return-path",
-+        "pause-before-switchover",
-+        "multifd",
-+        "dirty-bitmaps",
-+        "postcopy-blocktime",
-+        "late-block-activate",
-+        "x-ignore-shared",
-+        "validate-uuid",
-+        "background-snapshot",
-+        "zero-copy-send",
-+        "postcopy-preempt",
-+        "switchover-ack",
-+        "dirty-limit",
-+        "mapped-ram"
-+      ]
-+    },
-+    {
-+      "name": "434",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "zlib"
-+        },
-+        {
-+          "name": "zstd"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "zlib",
-+        "zstd"
-+      ]
-+    },
-+    {
-+      "name": "[435]",
-+      "element-type": "435",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "435",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "alias",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmaps",
-+          "type": "[655]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "436",
-+      "members": [
-+        {
-+          "name": "normal"
-+        },
-+        {
-+          "name": "cpr-reboot"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "normal",
-+        "cpr-reboot"
-+      ]
-+    },
-+    {
-+      "name": "437",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "legacy"
-+        },
-+        {
-+          "name": "multifd"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "legacy",
-+        "multifd"
-+      ]
-+    },
-+    {
-+      "name": "438",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "primary"
-+        },
-+        {
-+          "name": "secondary"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "primary",
-+        "secondary"
-+      ]
-+    },
-+    {
-+      "name": "439",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "request"
-+        },
-+        {
-+          "name": "error"
-+        },
-+        {
-+          "name": "processing"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "request",
-+        "error",
-+        "processing"
-+      ]
-+    },
-+    {
-+      "name": "[440]",
-+      "element-type": "440",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "440",
-+      "members": [
-+        {
-+          "name": "channel-type",
-+          "type": "656"
-+        },
-+        {
-+          "name": "addr",
-+          "type": "657"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "441",
-+      "members": [
-+        {
-+          "name": "second"
-+        },
-+        {
-+          "name": "millisecond"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "second",
-+        "millisecond"
-+      ]
-+    },
-+    {
-+      "name": "442",
-+      "members": [
-+        {
-+          "name": "page-sampling"
-+        },
-+        {
-+          "name": "dirty-ring"
-+        },
-+        {
-+          "name": "dirty-bitmap"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "page-sampling",
-+        "dirty-ring",
-+        "dirty-bitmap"
-+      ]
-+    },
-+    {
-+      "name": "443",
-+      "members": [
-+        {
-+          "name": "unstarted"
-+        },
-+        {
-+          "name": "measuring"
-+        },
-+        {
-+          "name": "measured"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "unstarted",
-+        "measuring",
-+        "measured"
-+      ]
-+    },
-+    {
-+      "name": "[444]",
-+      "element-type": "444",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "444",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "dirty-rate",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[445]",
-+      "element-type": "445",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "445",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "abort",
-+          "type": "659"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-add",
-+          "type": "660"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-remove",
-+          "type": "661"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-clear",
-+          "type": "661"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-enable",
-+          "type": "661"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-disable",
-+          "type": "661"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-merge",
-+          "type": "662"
-+        },
-+        {
-+          "case": "blockdev-backup",
-+          "type": "663"
-+        },
-+        {
-+          "case": "blockdev-snapshot",
-+          "type": "664"
-+        },
-+        {
-+          "case": "blockdev-snapshot-internal-sync",
-+          "type": "665"
-+        },
-+        {
-+          "case": "blockdev-snapshot-sync",
-+          "type": "666"
-+        },
-+        {
-+          "case": "drive-backup",
-+          "type": "667"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "658"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "446",
-+      "members": [
-+        {
-+          "name": "completion-mode",
-+          "default": null,
-+          "type": "668"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "447",
-+      "members": [
-+        {
-+          "name": "unavailable"
-+        },
-+        {
-+          "name": "disabled"
-+        },
-+        {
-+          "name": "enabled"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "unavailable",
-+        "disabled",
-+        "enabled"
-+      ]
-+    },
-+    {
-+      "name": "[448]",
-+      "element-type": "448",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "448",
-+      "members": [
-+        {
-+          "name": "oob"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "oob"
-+      ]
-+    },
-+    {
-+      "name": "449",
-+      "members": [
-+        {
-+          "name": "major",
-+          "type": "int"
-+        },
-+        {
-+          "name": "minor",
-+          "type": "int"
-+        },
-+        {
-+          "name": "micro",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "450",
-+      "members": [
-+        {
-+          "name": "builtin"
-+        },
-+        {
-+          "name": "enum"
-+        },
-+        {
-+          "name": "array"
-+        },
-+        {
-+          "name": "object"
-+        },
-+        {
-+          "name": "alternate"
-+        },
-+        {
-+          "name": "command"
-+        },
-+        {
-+          "name": "event"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "builtin",
-+        "enum",
-+        "array",
-+        "object",
-+        "alternate",
-+        "command",
-+        "event"
-+      ]
-+    },
-+    {
-+      "name": "451",
-+      "members": [
-+        {
-+          "name": "json-type",
-+          "type": "669"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "452",
-+      "members": [
-+        {
-+          "name": "members",
-+          "type": "[670]"
-+        },
-+        {
-+          "name": "values",
-+          "type": "[str]",
-+          "features": [
-+            "deprecated"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "453",
-+      "members": [
-+        {
-+          "name": "element-type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "454",
-+      "members": [
-+        {
-+          "name": "members",
-+          "type": "[671]"
-+        },
-+        {
-+          "name": "tag",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "variants",
-+          "default": null,
-+          "type": "[672]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "455",
-+      "members": [
-+        {
-+          "name": "members",
-+          "type": "[673]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "456",
-+      "members": [
-+        {
-+          "name": "arg-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "ret-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "allow-oob",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "457",
-+      "members": [
-+        {
-+          "name": "arg-type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "458",
-+      "members": [
-+        {
-+          "name": "acpi-generic-initiator"
-+        },
-+        {
-+          "name": "acpi-generic-port"
-+        },
-+        {
-+          "name": "authz-list"
-+        },
-+        {
-+          "name": "authz-listfile"
-+        },
-+        {
-+          "name": "authz-pam"
-+        },
-+        {
-+          "name": "authz-simple"
-+        },
-+        {
-+          "name": "can-bus"
-+        },
-+        {
-+          "name": "can-host-socketcan"
-+        },
-+        {
-+          "name": "colo-compare"
-+        },
-+        {
-+          "name": "cryptodev-backend"
-+        },
-+        {
-+          "name": "cryptodev-backend-builtin"
-+        },
-+        {
-+          "name": "cryptodev-backend-lkcf"
-+        },
-+        {
-+          "name": "cryptodev-vhost-user"
-+        },
-+        {
-+          "name": "dbus-vmstate"
-+        },
-+        {
-+          "name": "filter-buffer"
-+        },
-+        {
-+          "name": "filter-dump"
-+        },
-+        {
-+          "name": "filter-mirror"
-+        },
-+        {
-+          "name": "filter-redirector"
-+        },
-+        {
-+          "name": "filter-replay"
-+        },
-+        {
-+          "name": "filter-rewriter"
-+        },
-+        {
-+          "name": "input-barrier"
-+        },
-+        {
-+          "name": "input-linux"
-+        },
-+        {
-+          "name": "iommufd"
-+        },
-+        {
-+          "name": "iothread"
-+        },
-+        {
-+          "name": "main-loop"
-+        },
-+        {
-+          "name": "memory-backend-epc"
-+        },
-+        {
-+          "name": "memory-backend-file"
-+        },
-+        {
-+          "name": "memory-backend-memfd"
-+        },
-+        {
-+          "name": "memory-backend-ram"
-+        },
-+        {
-+          "name": "memory-backend-shm"
-+        },
-+        {
-+          "name": "pef-guest"
-+        },
-+        {
-+          "name": "pr-manager-helper"
-+        },
-+        {
-+          "name": "qtest"
-+        },
-+        {
-+          "name": "rng-builtin"
-+        },
-+        {
-+          "name": "rng-egd"
-+        },
-+        {
-+          "name": "rng-random"
-+        },
-+        {
-+          "name": "secret"
-+        },
-+        {
-+          "name": "secret_keyring"
-+        },
-+        {
-+          "name": "sev-guest"
-+        },
-+        {
-+          "name": "sev-snp-guest"
-+        },
-+        {
-+          "name": "thread-context"
-+        },
-+        {
-+          "name": "s390-pv-guest"
-+        },
-+        {
-+          "name": "throttle-group"
-+        },
-+        {
-+          "name": "tls-creds-anon"
-+        },
-+        {
-+          "name": "tls-creds-psk"
-+        },
-+        {
-+          "name": "tls-creds-x509"
-+        },
-+        {
-+          "name": "tls-cipher-suites"
-+        },
-+        {
-+          "name": "x-remote-object",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-vfio-user-server",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "acpi-generic-initiator",
-+        "acpi-generic-port",
-+        "authz-list",
-+        "authz-listfile",
-+        "authz-pam",
-+        "authz-simple",
-+        "can-bus",
-+        "can-host-socketcan",
-+        "colo-compare",
-+        "cryptodev-backend",
-+        "cryptodev-backend-builtin",
-+        "cryptodev-backend-lkcf",
-+        "cryptodev-vhost-user",
-+        "dbus-vmstate",
-+        "filter-buffer",
-+        "filter-dump",
-+        "filter-mirror",
-+        "filter-redirector",
-+        "filter-replay",
-+        "filter-rewriter",
-+        "input-barrier",
-+        "input-linux",
-+        "iommufd",
-+        "iothread",
-+        "main-loop",
-+        "memory-backend-epc",
-+        "memory-backend-file",
-+        "memory-backend-memfd",
-+        "memory-backend-ram",
-+        "memory-backend-shm",
-+        "pef-guest",
-+        "pr-manager-helper",
-+        "qtest",
-+        "rng-builtin",
-+        "rng-egd",
-+        "rng-random",
-+        "secret",
-+        "secret_keyring",
-+        "sev-guest",
-+        "sev-snp-guest",
-+        "thread-context",
-+        "s390-pv-guest",
-+        "throttle-group",
-+        "tls-creds-anon",
-+        "tls-creds-psk",
-+        "tls-creds-x509",
-+        "tls-cipher-suites",
-+        "x-remote-object",
-+        "x-vfio-user-server"
-+      ]
-+    },
-+    {
-+      "name": "459",
-+      "members": [
-+        {
-+          "name": "pci-dev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "460",
-+      "members": [
-+        {
-+          "name": "pci-bus",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "461",
-+      "members": [
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "674"
-+        },
-+        {
-+          "name": "rules",
-+          "default": null,
-+          "type": "[675]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "462",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "refresh",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "463",
-+      "members": [
-+        {
-+          "name": "service",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "464",
-+      "members": [
-+        {
-+          "name": "identity",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "465",
-+      "members": [
-+        {
-+          "name": "if",
-+          "type": "str"
-+        },
-+        {
-+          "name": "canbus",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "466",
-+      "members": [
-+        {
-+          "name": "primary_in",
-+          "type": "str"
-+        },
-+        {
-+          "name": "secondary_in",
-+          "type": "str"
-+        },
-+        {
-+          "name": "outdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "iothread",
-+          "type": "str"
-+        },
-+        {
-+          "name": "notify_dev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "compare_timeout",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "expired_scan_cycle",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max_queue_size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "vnet_hdr_support",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "467",
-+      "members": [
-+        {
-+          "name": "queues",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-bps",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-ops",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "468",
-+      "members": [
-+        {
-+          "name": "queues",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-bps",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "throttle-ops",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "469",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id-list",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "470",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "676"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "677"
-+        },
-+        {
-+          "name": "interval",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "471",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "676"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "677"
-+        },
-+        {
-+          "name": "file",
-+          "type": "str"
-+        },
-+        {
-+          "name": "maxlen",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "472",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "676"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "677"
-+        },
-+        {
-+          "name": "outdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vnet_hdr_support",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "473",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "676"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "677"
-+        },
-+        {
-+          "name": "indev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "outdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vnet_hdr_support",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "474",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "676"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "677"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "475",
-+      "members": [
-+        {
-+          "name": "netdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "queue",
-+          "default": null,
-+          "type": "676"
-+        },
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "position",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "insert",
-+          "default": null,
-+          "type": "677"
-+        },
-+        {
-+          "name": "vnet_hdr_support",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "476",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "x-origin",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "y-origin",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "width",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "height",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "477",
-+      "members": [
-+        {
-+          "name": "evdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "grab_all",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "repeat",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "grab-toggle",
-+          "default": null,
-+          "type": "678"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "478",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "479",
-+      "members": [
-+        {
-+          "name": "aio-max-batch",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-pool-min",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-pool-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-max-ns",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-grow",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "poll-shrink",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "480",
-+      "members": [
-+        {
-+          "name": "aio-max-batch",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-pool-min",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-pool-max",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "481",
-+      "members": [
-+        {
-+          "name": "dump",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "merge",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "507"
-+        },
-+        {
-+          "name": "prealloc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-context",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-use-canonical-path-for-ramblock-id",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "482",
-+      "members": [
-+        {
-+          "name": "dump",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "merge",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "507"
-+        },
-+        {
-+          "name": "prealloc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-context",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-use-canonical-path-for-ramblock-id",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "align",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "discard-data",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "mem-path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "readonly",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "rom",
-+          "default": null,
-+          "type": "586"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "483",
-+      "members": [
-+        {
-+          "name": "dump",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "merge",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "507"
-+        },
-+        {
-+          "name": "prealloc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-context",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-use-canonical-path-for-ramblock-id",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "hugetlb",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "hugetlbsize",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "seal",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "484",
-+      "members": [
-+        {
-+          "name": "dump",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "merge",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "507"
-+        },
-+        {
-+          "name": "prealloc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-context",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-use-canonical-path-for-ramblock-id",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "485",
-+      "members": [
-+        {
-+          "name": "dump",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "merge",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "507"
-+        },
-+        {
-+          "name": "prealloc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "prealloc-context",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reserve",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-use-canonical-path-for-ramblock-id",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "486",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "487",
-+      "members": [
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "log",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "488",
-+      "members": [
-+        {
-+          "name": "opened",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "deprecated"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "489",
-+      "members": [
-+        {
-+          "name": "opened",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "490",
-+      "members": [
-+        {
-+          "name": "opened",
-+          "default": null,
-+          "type": "bool",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "filename",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "491",
-+      "members": [
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "679"
-+        },
-+        {
-+          "name": "keyid",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "iv",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "data",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "file",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "492",
-+      "members": [
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "679"
-+        },
-+        {
-+          "name": "keyid",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "iv",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "serial",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "493",
-+      "members": [
-+        {
-+          "name": "sev-device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cbitpos",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "reduced-phys-bits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "kernel-hashes",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dh-cert-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "session-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "handle",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "legacy-vm-type",
-+          "default": null,
-+          "type": "586"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "494",
-+      "members": [
-+        {
-+          "name": "sev-device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cbitpos",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "reduced-phys-bits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "kernel-hashes",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "policy",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "guest-visible-workarounds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id-block",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id-auth",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "author-key-enabled",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-data",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "vcek-disabled",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "495",
-+      "members": [
-+        {
-+          "name": "cpu-affinity",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "node-affinity",
-+          "default": null,
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "496",
-+      "members": [
-+        {
-+          "name": "limits",
-+          "default": null,
-+          "type": "680"
-+        },
-+        {
-+          "name": "x-iops-total",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-total-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-total-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-read",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-read-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-read-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-write",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-write-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-write-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-total",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-total-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-total-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-read",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-read-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-read-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-write",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-write-max",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-bps-write-max-length",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        },
-+        {
-+          "name": "x-iops-size",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "unstable"
-+          ]
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "497",
-+      "members": [
-+        {
-+          "name": "verify-peer",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dir",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "endpoint",
-+          "default": null,
-+          "type": "681"
-+        },
-+        {
-+          "name": "priority",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "498",
-+      "members": [
-+        {
-+          "name": "verify-peer",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dir",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "endpoint",
-+          "default": null,
-+          "type": "681"
-+        },
-+        {
-+          "name": "priority",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "username",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "499",
-+      "members": [
-+        {
-+          "name": "verify-peer",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dir",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "endpoint",
-+          "default": null,
-+          "type": "681"
-+        },
-+        {
-+          "name": "priority",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sanity-check",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "passwordid",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "500",
-+      "members": [
-+        {
-+          "name": "verify-peer",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dir",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "endpoint",
-+          "default": null,
-+          "type": "681"
-+        },
-+        {
-+          "name": "priority",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "501",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "type": "str"
-+        },
-+        {
-+          "name": "devid",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "502",
-+      "members": [
-+        {
-+          "name": "socket",
-+          "type": "391"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "503",
-+      "members": [
-+        {
-+          "name": "node-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "drawer-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "book-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "socket-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "die-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "module-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "core-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-id",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "504",
-+      "members": [
-+        {
-+          "name": "aarch64"
-+        },
-+        {
-+          "name": "alpha"
-+        },
-+        {
-+          "name": "arm"
-+        },
-+        {
-+          "name": "avr"
-+        },
-+        {
-+          "name": "hppa"
-+        },
-+        {
-+          "name": "i386"
-+        },
-+        {
-+          "name": "loongarch64"
-+        },
-+        {
-+          "name": "m68k"
-+        },
-+        {
-+          "name": "microblaze"
-+        },
-+        {
-+          "name": "microblazeel"
-+        },
-+        {
-+          "name": "mips"
-+        },
-+        {
-+          "name": "mips64"
-+        },
-+        {
-+          "name": "mips64el"
-+        },
-+        {
-+          "name": "mipsel"
-+        },
-+        {
-+          "name": "or1k"
-+        },
-+        {
-+          "name": "ppc"
-+        },
-+        {
-+          "name": "ppc64"
-+        },
-+        {
-+          "name": "riscv32"
-+        },
-+        {
-+          "name": "riscv64"
-+        },
-+        {
-+          "name": "rx"
-+        },
-+        {
-+          "name": "s390x"
-+        },
-+        {
-+          "name": "sh4"
-+        },
-+        {
-+          "name": "sh4eb"
-+        },
-+        {
-+          "name": "sparc"
-+        },
-+        {
-+          "name": "sparc64"
-+        },
-+        {
-+          "name": "tricore"
-+        },
-+        {
-+          "name": "x86_64"
-+        },
-+        {
-+          "name": "xtensa"
-+        },
-+        {
-+          "name": "xtensaeb"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "aarch64",
-+        "alpha",
-+        "arm",
-+        "avr",
-+        "hppa",
-+        "i386",
-+        "loongarch64",
-+        "m68k",
-+        "microblaze",
-+        "microblazeel",
-+        "mips",
-+        "mips64",
-+        "mips64el",
-+        "mipsel",
-+        "or1k",
-+        "ppc",
-+        "ppc64",
-+        "riscv32",
-+        "riscv64",
-+        "rx",
-+        "s390x",
-+        "sh4",
-+        "sh4eb",
-+        "sparc",
-+        "sparc64",
-+        "tricore",
-+        "x86_64",
-+        "xtensa",
-+        "xtensaeb"
-+      ]
-+    },
-+    {
-+      "name": "505",
-+      "members": [
-+        {
-+          "name": "cpu-state",
-+          "type": "682"
-+        },
-+        {
-+          "name": "dedicated",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "entitlement",
-+          "default": null,
-+          "type": "523"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[506]",
-+      "element-type": "506",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "506",
-+      "members": [
-+        {
-+          "name": "qom-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        },
-+        {
-+          "name": "value",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "507",
-+      "members": [
-+        {
-+          "name": "default"
-+        },
-+        {
-+          "name": "preferred"
-+        },
-+        {
-+          "name": "bind"
-+        },
-+        {
-+          "name": "interleave"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "default",
-+        "preferred",
-+        "bind",
-+        "interleave"
-+      ]
-+    },
-+    {
-+      "name": "508",
-+      "members": [
-+        {
-+          "name": "node"
-+        },
-+        {
-+          "name": "dist"
-+        },
-+        {
-+          "name": "cpu"
-+        },
-+        {
-+          "name": "hmat-lb"
-+        },
-+        {
-+          "name": "hmat-cache"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "node",
-+        "dist",
-+        "cpu",
-+        "hmat-lb",
-+        "hmat-cache"
-+      ]
-+    },
-+    {
-+      "name": "509",
-+      "members": [
-+        {
-+          "name": "nodeid",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpus",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "mem",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "initiator",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "510",
-+      "members": [
-+        {
-+          "name": "src",
-+          "type": "int"
-+        },
-+        {
-+          "name": "dst",
-+          "type": "int"
-+        },
-+        {
-+          "name": "val",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "511",
-+      "members": [
-+        {
-+          "name": "node-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "drawer-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "book-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "socket-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "die-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "module-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "core-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-id",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "512",
-+      "members": [
-+        {
-+          "name": "initiator",
-+          "type": "int"
-+        },
-+        {
-+          "name": "target",
-+          "type": "int"
-+        },
-+        {
-+          "name": "hierarchy",
-+          "type": "683"
-+        },
-+        {
-+          "name": "data-type",
-+          "type": "684"
-+        },
-+        {
-+          "name": "latency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bandwidth",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "513",
-+      "members": [
-+        {
-+          "name": "node-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "level",
-+          "type": "int"
-+        },
-+        {
-+          "name": "associativity",
-+          "type": "685"
-+        },
-+        {
-+          "name": "policy",
-+          "type": "686"
-+        },
-+        {
-+          "name": "line",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "514",
-+      "members": [
-+        {
-+          "name": "dimm"
-+        },
-+        {
-+          "name": "nvdimm"
-+        },
-+        {
-+          "name": "virtio-pmem"
-+        },
-+        {
-+          "name": "virtio-mem"
-+        },
-+        {
-+          "name": "sgx-epc"
-+        },
-+        {
-+          "name": "hv-balloon"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "dimm",
-+        "nvdimm",
-+        "virtio-pmem",
-+        "virtio-mem",
-+        "sgx-epc",
-+        "hv-balloon"
-+      ]
-+    },
-+    {
-+      "name": "515",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "687"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "516",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "688"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "517",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "689"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "518",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "690"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "519",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "691"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "520",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "521",
-+      "members": [
-+        {
-+          "name": "incompatible"
-+        },
-+        {
-+          "name": "identical"
-+        },
-+        {
-+          "name": "superset"
-+        },
-+        {
-+          "name": "subset"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "incompatible",
-+        "identical",
-+        "superset",
-+        "subset"
-+      ]
-+    },
-+    {
-+      "name": "522",
-+      "members": [
-+        {
-+          "name": "static"
-+        },
-+        {
-+          "name": "full"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "static",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "523",
-+      "members": [
-+        {
-+          "name": "auto"
-+        },
-+        {
-+          "name": "low"
-+        },
-+        {
-+          "name": "medium"
-+        },
-+        {
-+          "name": "high"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "auto",
-+        "low",
-+        "medium",
-+        "high"
-+      ]
-+    },
-+    {
-+      "name": "524",
-+      "members": [
-+        {
-+          "name": "horizontal"
-+        },
-+        {
-+          "name": "vertical"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "horizontal",
-+        "vertical"
-+      ]
-+    },
-+    {
-+      "name": "525",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "record"
-+        },
-+        {
-+          "name": "play"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "record",
-+        "play"
-+      ]
-+    },
-+    {
-+      "name": "526",
-+      "members": [
-+        {
-+          "name": "block-node"
-+        },
-+        {
-+          "name": "chardev"
-+        },
-+        {
-+          "name": "migration"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "block-node",
-+        "chardev",
-+        "migration"
-+      ]
-+    },
-+    {
-+      "name": "527",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "528",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[529]",
-+      "element-type": "529",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "529",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[530]",
-+      "element-type": "530",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "530",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "692"
-+        },
-+        {
-+          "name": "help",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "default",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[535]",
-+      "element-type": "535",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "535",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "537",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "alsa"
-+        },
-+        {
-+          "name": "dbus"
-+        },
-+        {
-+          "name": "jack"
-+        },
-+        {
-+          "name": "oss"
-+        },
-+        {
-+          "name": "pa"
-+        },
-+        {
-+          "name": "pipewire"
-+        },
-+        {
-+          "name": "sdl"
-+        },
-+        {
-+          "name": "wav"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "alsa",
-+        "dbus",
-+        "jack",
-+        "oss",
-+        "pa",
-+        "pipewire",
-+        "sdl",
-+        "wav"
-+      ]
-+    },
-+    {
-+      "name": "538",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "693"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "693"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "539",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "694"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "694"
-+        },
-+        {
-+          "name": "threshold",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "540",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "695"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "695"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "541",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "693"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "693"
-+        },
-+        {
-+          "name": "latency",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "542",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "696"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "696"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "543",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "697"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "697"
-+        },
-+        {
-+          "name": "try-mmap",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "exclusive",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dsp-policy",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "544",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "698"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "698"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "545",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "699"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "699"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "546",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "700"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "700"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "547",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "693"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "693"
-+        },
-+        {
-+          "name": "dev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "latency",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "548",
-+      "members": [
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "693"
-+        },
-+        {
-+          "name": "out",
-+          "default": null,
-+          "type": "693"
-+        },
-+        {
-+          "name": "path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "549",
-+      "members": [
-+        {
-+          "name": "DIMM"
-+        },
-+        {
-+          "name": "CPU"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "DIMM",
-+        "CPU"
-+      ]
-+    },
-+    {
-+      "name": "[550]",
-+      "element-type": "550",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "550",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "int"
-+        },
-+        {
-+          "name": "function",
-+          "type": "int"
-+        },
-+        {
-+          "name": "class_info",
-+          "type": "701"
-+        },
-+        {
-+          "name": "id",
-+          "type": "702"
-+        },
-+        {
-+          "name": "irq",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "irq_pin",
-+          "type": "int"
-+        },
-+        {
-+          "name": "qdev_id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "pci_bridge",
-+          "default": null,
-+          "type": "703"
-+        },
-+        {
-+          "name": "regions",
-+          "type": "[704]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "551",
-+      "members": [
-+        {
-+          "name": "vm"
-+        },
-+        {
-+          "name": "vcpu"
-+        },
-+        {
-+          "name": "cryptodev"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "vm",
-+        "vcpu",
-+        "cryptodev"
-+      ]
-+    },
-+    {
-+      "name": "[552]",
-+      "element-type": "552",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "552",
-+      "members": [
-+        {
-+          "name": "provider",
-+          "type": "554"
-+        },
-+        {
-+          "name": "names",
-+          "default": null,
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "553",
-+      "members": [
-+        {
-+          "name": "vcpus",
-+          "default": null,
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "554",
-+      "members": [
-+        {
-+          "name": "kvm"
-+        },
-+        {
-+          "name": "cryptodev"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "kvm",
-+        "cryptodev"
-+      ]
-+    },
-+    {
-+      "name": "[555]",
-+      "element-type": "555",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "555",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "value",
-+          "type": "705"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[556]",
-+      "element-type": "556",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "556",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "706"
-+        },
-+        {
-+          "name": "unit",
-+          "default": null,
-+          "type": "707"
-+        },
-+        {
-+          "name": "base",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "exponent",
-+          "type": "int"
-+        },
-+        {
-+          "name": "bucket-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "557",
-+      "members": [
-+        {
-+          "name": "transports",
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "dev-features",
-+          "default": null,
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "unknown-dev-features",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "558",
-+      "members": [
-+        {
-+          "name": "statuses",
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "unknown-statuses",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "559",
-+      "members": [
-+        {
-+          "name": "n-mem-sections",
-+          "type": "int"
-+        },
-+        {
-+          "name": "n-tmp-sections",
-+          "type": "int"
-+        },
-+        {
-+          "name": "nvqs",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vq-index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "features",
-+          "type": "557"
-+        },
-+        {
-+          "name": "acked-features",
-+          "type": "557"
-+        },
-+        {
-+          "name": "backend-features",
-+          "type": "557"
-+        },
-+        {
-+          "name": "protocol-features",
-+          "type": "708"
-+        },
-+        {
-+          "name": "max-queues",
-+          "type": "int"
-+        },
-+        {
-+          "name": "backend-cap",
-+          "type": "int"
-+        },
-+        {
-+          "name": "log-enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "log-size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[560]",
-+      "element-type": "560",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "560",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flags",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "561",
-+      "members": [
-+        {
-+          "name": "flags",
-+          "type": "int"
-+        },
-+        {
-+          "name": "idx",
-+          "type": "int"
-+        },
-+        {
-+          "name": "ring",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "562",
-+      "members": [
-+        {
-+          "name": "flags",
-+          "type": "int"
-+        },
-+        {
-+          "name": "idx",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "563",
-+      "members": [
-+        {
-+          "name": "stop"
-+        },
-+        {
-+          "name": "running"
-+        },
-+        {
-+          "name": "stop-copy"
-+        },
-+        {
-+          "name": "resuming"
-+        },
-+        {
-+          "name": "running-p2p"
-+        },
-+        {
-+          "name": "pre-copy"
-+        },
-+        {
-+          "name": "pre-copy-p2p"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "stop",
-+        "running",
-+        "stop-copy",
-+        "resuming",
-+        "running-p2p",
-+        "pre-copy",
-+        "pre-copy-p2p"
-+      ]
-+    },
-+    {
-+      "name": "[564]",
-+      "element-type": "564",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "564",
-+      "members": [
-+        {
-+          "name": "cipher"
-+        },
-+        {
-+          "name": "hash"
-+        },
-+        {
-+          "name": "mac"
-+        },
-+        {
-+          "name": "aead"
-+        },
-+        {
-+          "name": "akcipher"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "cipher",
-+        "hash",
-+        "mac",
-+        "aead",
-+        "akcipher"
-+      ]
-+    },
-+    {
-+      "name": "[565]",
-+      "element-type": "565",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "565",
-+      "members": [
-+        {
-+          "name": "queue",
-+          "type": "int"
-+        },
-+        {
-+          "name": "type",
-+          "type": "709"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "566",
-+      "members": [
-+        {
-+          "name": "informational"
-+        },
-+        {
-+          "name": "warning"
-+        },
-+        {
-+          "name": "failure"
-+        },
-+        {
-+          "name": "fatal"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "informational",
-+        "warning",
-+        "failure",
-+        "fatal"
-+      ]
-+    },
-+    {
-+      "name": "[567]",
-+      "element-type": "567",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "567",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "710"
-+        },
-+        {
-+          "name": "header",
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "568",
-+      "members": [
-+        {
-+          "name": "cache-data-ecc"
-+        },
-+        {
-+          "name": "mem-data-ecc"
-+        },
-+        {
-+          "name": "crc-threshold"
-+        },
-+        {
-+          "name": "retry-threshold"
-+        },
-+        {
-+          "name": "cache-poison-received"
-+        },
-+        {
-+          "name": "mem-poison-received"
-+        },
-+        {
-+          "name": "physical"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "cache-data-ecc",
-+        "mem-data-ecc",
-+        "crc-threshold",
-+        "retry-threshold",
-+        "cache-poison-received",
-+        "mem-poison-received",
-+        "physical"
-+      ]
-+    },
-+    {
-+      "name": "569",
-+      "members": [
-+        {
-+          "name": "free"
-+        },
-+        {
-+          "name": "contiguous"
-+        },
-+        {
-+          "name": "prescriptive"
-+        },
-+        {
-+          "name": "enable-shared-access"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "free",
-+        "contiguous",
-+        "prescriptive",
-+        "enable-shared-access"
-+      ]
-+    },
-+    {
-+      "name": "[570]",
-+      "element-type": "570",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "570",
-+      "members": [
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "571",
-+      "members": [
-+        {
-+          "name": "tag-based"
-+        },
-+        {
-+          "name": "prescriptive"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "tag-based",
-+        "prescriptive"
-+      ]
-+    },
-+    {
-+      "name": "572",
-+      "members": [
-+        {
-+          "name": "hyper-v"
-+        },
-+        {
-+          "name": "s390"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "hyper-v",
-+        "s390"
-+      ]
-+    },
-+    {
-+      "name": "573",
-+      "members": [
-+        {
-+          "name": "arg1",
-+          "type": "int"
-+        },
-+        {
-+          "name": "arg2",
-+          "type": "int"
-+        },
-+        {
-+          "name": "arg3",
-+          "type": "int"
-+        },
-+        {
-+          "name": "arg4",
-+          "type": "int"
-+        },
-+        {
-+          "name": "arg5",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "574",
-+      "members": [
-+        {
-+          "name": "core",
-+          "type": "int"
-+        },
-+        {
-+          "name": "psw-mask",
-+          "type": "int"
-+        },
-+        {
-+          "name": "psw-addr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "711"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[575]",
-+      "element-type": "575",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "575",
-+      "members": [
-+        {
-+          "name": "interval_length",
-+          "type": "int"
-+        },
-+        {
-+          "name": "min_rd_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max_rd_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avg_rd_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "min_wr_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max_wr_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avg_wr_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "min_zone_append_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max_zone_append_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avg_zone_append_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "min_flush_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max_flush_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avg_flush_latency_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "avg_rd_queue_depth",
-+          "type": "number"
-+        },
-+        {
-+          "name": "avg_wr_queue_depth",
-+          "type": "number"
-+        },
-+        {
-+          "name": "avg_zone_append_queue_depth",
-+          "type": "number"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "576",
-+      "members": [
-+        {
-+          "name": "boundaries",
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "bins",
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "577",
-+      "members": [
-+        {
-+          "name": "discard-nb-ok",
-+          "type": "int"
-+        },
-+        {
-+          "name": "discard-nb-failed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "discard-bytes-ok",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "578",
-+      "members": [
-+        {
-+          "name": "completion-errors",
-+          "type": "int"
-+        },
-+        {
-+          "name": "aligned-accesses",
-+          "type": "int"
-+        },
-+        {
-+          "name": "unaligned-accesses",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[78]",
-+      "element-type": "78",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "579",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "qcow2",
-+          "type": "713"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "714"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "715"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "716"
-+        },
-+        {
-+          "case": "file",
-+          "type": "717"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "712"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "580",
-+      "members": [
-+        {
-+          "name": "block-backend"
-+        },
-+        {
-+          "name": "block-job"
-+        },
-+        {
-+          "name": "block-driver"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "block-backend",
-+        "block-job",
-+        "block-driver"
-+      ]
-+    },
-+    {
-+      "name": "[581]",
-+      "element-type": "581",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "581",
-+      "members": [
-+        {
-+          "name": "consistent-read"
-+        },
-+        {
-+          "name": "write"
-+        },
-+        {
-+          "name": "write-unchanged"
-+        },
-+        {
-+          "name": "resize"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "consistent-read",
-+        "write",
-+        "write-unchanged",
-+        "resize"
-+      ]
-+    },
-+    {
-+      "name": "582",
-+      "members": [
-+        {
-+          "type": "58"
-+        },
-+        {
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "[583]",
-+      "element-type": "583",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "583",
-+      "members": [
-+        {
-+          "name": "event",
-+          "type": "718"
-+        },
-+        {
-+          "name": "state",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iotype",
-+          "default": null,
-+          "type": "719"
-+        },
-+        {
-+          "name": "errno",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "sector",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "once",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "immediately",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[584]",
-+      "element-type": "584",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "584",
-+      "members": [
-+        {
-+          "name": "event",
-+          "type": "718"
-+        },
-+        {
-+          "name": "state",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "new_state",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "585",
-+      "members": [
-+        {
-+          "name": "break-guest-write"
-+        },
-+        {
-+          "name": "break-snapshot"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "break-guest-write",
-+        "break-snapshot"
-+      ]
-+    },
-+    {
-+      "name": "586",
-+      "members": [
-+        {
-+          "name": "auto"
-+        },
-+        {
-+          "name": "on"
-+        },
-+        {
-+          "name": "off"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "auto",
-+        "on",
-+        "off"
-+      ]
-+    },
-+    {
-+      "name": "587",
-+      "members": [
-+        {
-+          "name": "threads"
-+        },
-+        {
-+          "name": "native"
-+        },
-+        {
-+          "name": "io_uring"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "threads",
-+        "native",
-+        "io_uring"
-+      ]
-+    },
-+    {
-+      "name": "588",
-+      "members": [
-+        {
-+          "name": "tcp"
-+        },
-+        {
-+          "name": "iser"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "tcp",
-+        "iser"
-+      ]
-+    },
-+    {
-+      "name": "589",
-+      "members": [
-+        {
-+          "name": "crc32c"
-+        },
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "crc32c-none"
-+        },
-+        {
-+          "name": "none-crc32c"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "crc32c",
-+        "none",
-+        "crc32c-none",
-+        "none-crc32c"
-+      ]
-+    },
-+    {
-+      "name": "590",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "720"
-+        },
-+        {
-+          "name": "host",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "591",
-+      "members": [
-+        {
-+          "type": "58"
-+        },
-+        {
-+          "type": "str"
-+        },
-+        {
-+          "type": "null"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "592",
-+      "members": [
-+        {
-+          "type": "721"
-+        },
-+        {
-+          "type": "722"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "593",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "aes",
-+          "type": "724"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "725"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "723"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "594",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "aes",
-+          "type": "724"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "726"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[582]",
-+      "element-type": "582",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "595",
-+      "members": [
-+        {
-+          "name": "quorum"
-+        },
-+        {
-+          "name": "fifo"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "quorum",
-+        "fifo"
-+      ]
-+    },
-+    {
-+      "name": "596",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "luks",
-+          "type": "728"
-+        },
-+        {
-+          "case": "luks2",
-+          "type": "729"
-+        },
-+        {
-+          "case": "luks-any",
-+          "type": "730"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "727"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "596"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[597]",
-+      "element-type": "597",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "597",
-+      "members": [
-+        {
-+          "name": "cephx"
-+        },
-+        {
-+          "name": "none"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "cephx",
-+        "none"
-+      ]
-+    },
-+    {
-+      "name": "[598]",
-+      "element-type": "598",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "598",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "599",
-+      "members": [
-+        {
-+          "name": "primary"
-+        },
-+        {
-+          "name": "secondary"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "primary",
-+        "secondary"
-+      ]
-+    },
-+    {
-+      "name": "600",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        },
-+        {
-+          "name": "numeric",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "to",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "ipv4",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ipv6",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "keep-alive",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "mptcp",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "601",
-+      "tag": "mode",
-+      "variants": [
-+        {
-+          "case": "hash",
-+          "type": "732"
-+        },
-+        {
-+          "case": "none",
-+          "type": "0"
-+        },
-+        {
-+          "case": "known_hosts",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "mode",
-+          "type": "731"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "602",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "733"
-+        },
-+        {
-+          "name": "nocow",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "extent-size-hint",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "603",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "330"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "733"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "604",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cipher-alg",
-+          "default": null,
-+          "type": "734"
-+        },
-+        {
-+          "name": "cipher-mode",
-+          "default": null,
-+          "type": "735"
-+        },
-+        {
-+          "name": "ivgen-alg",
-+          "default": null,
-+          "type": "736"
-+        },
-+        {
-+          "name": "ivgen-hash-alg",
-+          "default": null,
-+          "type": "737"
-+        },
-+        {
-+          "name": "hash-alg",
-+          "default": null,
-+          "type": "737"
-+        },
-+        {
-+          "name": "iter-time",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "file",
-+          "default": null,
-+          "type": "582"
-+        },
-+        {
-+          "name": "header",
-+          "default": null,
-+          "type": "582"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "733"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "605",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "337"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "606",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "607",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "738"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "608",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "data-file",
-+          "default": null,
-+          "type": "582"
-+        },
-+        {
-+          "name": "data-file-raw",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "extended-l2",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "version",
-+          "default": null,
-+          "type": "739"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-fmt",
-+          "default": null,
-+          "type": "317"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "738"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "733"
-+        },
-+        {
-+          "name": "lazy-refcounts",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "refcount-bits",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "compression-type",
-+          "default": null,
-+          "type": "740"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "609",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-fmt",
-+          "default": null,
-+          "type": "317"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "table-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "610",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "347"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "741"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "611",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "349"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "612",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "733"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "613",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "log-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "subformat",
-+          "default": null,
-+          "type": "742"
-+        },
-+        {
-+          "name": "block-state-zero",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "614",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "extents",
-+          "default": null,
-+          "type": "[582]"
-+        },
-+        {
-+          "name": "subformat",
-+          "default": null,
-+          "type": "743"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "adapter-type",
-+          "default": null,
-+          "type": "744"
-+        },
-+        {
-+          "name": "hwversion",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "toolsversion",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "zeroed-grain",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "615",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "582"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "subformat",
-+          "default": null,
-+          "type": "745"
-+        },
-+        {
-+          "name": "force-size",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "616",
-+      "members": [
-+        {
-+          "name": "state",
-+          "type": "746"
-+        },
-+        {
-+          "name": "new-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "old-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "keyslot",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iter-time",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "617",
-+      "members": [
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "747"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "null",
-+      "json-type": "null",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "618",
-+      "members": [
-+        {
-+          "name": "inet"
-+        },
-+        {
-+          "name": "unix"
-+        },
-+        {
-+          "name": "vsock"
-+        },
-+        {
-+          "name": "fd"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "inet",
-+        "unix",
-+        "vsock",
-+        "fd"
-+      ]
-+    },
-+    {
-+      "name": "619",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "600"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "620",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "641"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "621",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "642"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "622",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "643"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "623",
-+      "members": [
-+        {
-+          "name": "off"
-+        },
-+        {
-+          "name": "on"
-+        },
-+        {
-+          "name": "auto"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on",
-+        "auto"
-+      ]
-+    },
-+    {
-+      "name": "624",
-+      "members": [
-+        {
-+          "name": "file"
-+        },
-+        {
-+          "name": "serial"
-+        },
-+        {
-+          "name": "parallel"
-+        },
-+        {
-+          "name": "pipe"
-+        },
-+        {
-+          "name": "socket"
-+        },
-+        {
-+          "name": "udp"
-+        },
-+        {
-+          "name": "pty"
-+        },
-+        {
-+          "name": "null"
-+        },
-+        {
-+          "name": "mux"
-+        },
-+        {
-+          "name": "msmouse"
-+        },
-+        {
-+          "name": "wctablet"
-+        },
-+        {
-+          "name": "braille"
-+        },
-+        {
-+          "name": "testdev"
-+        },
-+        {
-+          "name": "stdio"
-+        },
-+        {
-+          "name": "dbus"
-+        },
-+        {
-+          "name": "vc"
-+        },
-+        {
-+          "name": "ringbuf"
-+        },
-+        {
-+          "name": "memory",
-+          "features": [
-+            "deprecated"
-+          ]
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "file",
-+        "serial",
-+        "parallel",
-+        "pipe",
-+        "socket",
-+        "udp",
-+        "pty",
-+        "null",
-+        "mux",
-+        "msmouse",
-+        "wctablet",
-+        "braille",
-+        "testdev",
-+        "stdio",
-+        "dbus",
-+        "vc",
-+        "ringbuf",
-+        "memory"
-+      ]
-+    },
-+    {
-+      "name": "625",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "748"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "626",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "749"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "627",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "750"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "628",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "751"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "629",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "752"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "630",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "753"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "631",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "754"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "632",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "755"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "636",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "759"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "637",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "760"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "638",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "761"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[639]",
-+      "element-type": "639",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "639",
-+      "members": [
-+        {
-+          "name": "str",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "640",
-+      "members": [
-+        {
-+          "name": "native"
-+        },
-+        {
-+          "name": "skb"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "native",
-+        "skb"
-+      ]
-+    },
-+    {
-+      "name": "641",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "tight",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "642",
-+      "members": [
-+        {
-+          "name": "cid",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "643",
-+      "members": [
-+        {
-+          "name": "str",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "644",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "762"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "645",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "763"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "646",
-+      "members": [
-+        {
-+          "name": "number"
-+        },
-+        {
-+          "name": "qcode"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "number",
-+        "qcode"
-+      ]
-+    },
-+    {
-+      "name": "647",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "648",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "764"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "649",
-+      "members": [
-+        {
-+          "name": "key"
-+        },
-+        {
-+          "name": "btn"
-+        },
-+        {
-+          "name": "rel"
-+        },
-+        {
-+          "name": "abs"
-+        },
-+        {
-+          "name": "mtt"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "key",
-+        "btn",
-+        "rel",
-+        "abs",
-+        "mtt"
-+      ]
-+    },
-+    {
-+      "name": "650",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "765"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "651",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "766"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "652",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "767"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "653",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "768"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "654",
-+      "members": [
-+        {
-+          "name": "lctrl-lalt"
-+        },
-+        {
-+          "name": "lshift-lctrl-lalt"
-+        },
-+        {
-+          "name": "rctrl"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "lctrl-lalt",
-+        "lshift-lctrl-lalt",
-+        "rctrl"
-+      ]
-+    },
-+    {
-+      "name": "number",
-+      "json-type": "number",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "[655]",
-+      "element-type": "655",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "655",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "alias",
-+          "type": "str"
-+        },
-+        {
-+          "name": "transform",
-+          "default": null,
-+          "type": "769"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "656",
-+      "members": [
-+        {
-+          "name": "main"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "main"
-+      ]
-+    },
-+    {
-+      "name": "657",
-+      "tag": "transport",
-+      "variants": [
-+        {
-+          "case": "socket",
-+          "type": "391"
-+        },
-+        {
-+          "case": "exec",
-+          "type": "771"
-+        },
-+        {
-+          "case": "rdma",
-+          "type": "600"
-+        },
-+        {
-+          "case": "file",
-+          "type": "772"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "transport",
-+          "type": "770"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "658",
-+      "members": [
-+        {
-+          "name": "abort"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-add"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-remove"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-clear"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-enable"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-disable"
-+        },
-+        {
-+          "name": "block-dirty-bitmap-merge"
-+        },
-+        {
-+          "name": "blockdev-backup"
-+        },
-+        {
-+          "name": "blockdev-snapshot"
-+        },
-+        {
-+          "name": "blockdev-snapshot-internal-sync"
-+        },
-+        {
-+          "name": "blockdev-snapshot-sync"
-+        },
-+        {
-+          "name": "drive-backup",
-+          "features": [
-+            "deprecated"
-+          ]
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "abort",
-+        "block-dirty-bitmap-add",
-+        "block-dirty-bitmap-remove",
-+        "block-dirty-bitmap-clear",
-+        "block-dirty-bitmap-enable",
-+        "block-dirty-bitmap-disable",
-+        "block-dirty-bitmap-merge",
-+        "blockdev-backup",
-+        "blockdev-snapshot",
-+        "blockdev-snapshot-internal-sync",
-+        "blockdev-snapshot-sync",
-+        "drive-backup"
-+      ]
-+    },
-+    {
-+      "name": "659",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "773"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "660",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "44"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "661",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "45"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "662",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "46"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "663",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "39"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "664",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "35"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "665",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "76"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "666",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "34"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "667",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "38"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "668",
-+      "members": [
-+        {
-+          "name": "individual"
-+        },
-+        {
-+          "name": "grouped"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "individual",
-+        "grouped"
-+      ]
-+    },
-+    {
-+      "name": "669",
-+      "members": [
-+        {
-+          "name": "string"
-+        },
-+        {
-+          "name": "number"
-+        },
-+        {
-+          "name": "int"
-+        },
-+        {
-+          "name": "boolean"
-+        },
-+        {
-+          "name": "null"
-+        },
-+        {
-+          "name": "object"
-+        },
-+        {
-+          "name": "array"
-+        },
-+        {
-+          "name": "value"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "string",
-+        "number",
-+        "int",
-+        "boolean",
-+        "null",
-+        "object",
-+        "array",
-+        "value"
-+      ]
-+    },
-+    {
-+      "name": "[670]",
-+      "element-type": "670",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "670",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "features",
-+          "default": null,
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[671]",
-+      "element-type": "671",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "671",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "default",
-+          "default": null,
-+          "type": "any"
-+        },
-+        {
-+          "name": "features",
-+          "default": null,
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[672]",
-+      "element-type": "672",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "672",
-+      "members": [
-+        {
-+          "name": "case",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[673]",
-+      "element-type": "673",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "673",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "674",
-+      "members": [
-+        {
-+          "name": "deny"
-+        },
-+        {
-+          "name": "allow"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "deny",
-+        "allow"
-+      ]
-+    },
-+    {
-+      "name": "[675]",
-+      "element-type": "675",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "675",
-+      "members": [
-+        {
-+          "name": "match",
-+          "type": "str"
-+        },
-+        {
-+          "name": "policy",
-+          "type": "674"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "774"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "676",
-+      "members": [
-+        {
-+          "name": "all"
-+        },
-+        {
-+          "name": "rx"
-+        },
-+        {
-+          "name": "tx"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "all",
-+        "rx",
-+        "tx"
-+      ]
-+    },
-+    {
-+      "name": "677",
-+      "members": [
-+        {
-+          "name": "before"
-+        },
-+        {
-+          "name": "behind"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "before",
-+        "behind"
-+      ]
-+    },
-+    {
-+      "name": "678",
-+      "members": [
-+        {
-+          "name": "ctrl-ctrl"
-+        },
-+        {
-+          "name": "alt-alt"
-+        },
-+        {
-+          "name": "shift-shift"
-+        },
-+        {
-+          "name": "meta-meta"
-+        },
-+        {
-+          "name": "scrolllock"
-+        },
-+        {
-+          "name": "ctrl-scrolllock"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ctrl-ctrl",
-+        "alt-alt",
-+        "shift-shift",
-+        "meta-meta",
-+        "scrolllock",
-+        "ctrl-scrolllock"
-+      ]
-+    },
-+    {
-+      "name": "679",
-+      "members": [
-+        {
-+          "name": "raw"
-+        },
-+        {
-+          "name": "base64"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "raw",
-+        "base64"
-+      ]
-+    },
-+    {
-+      "name": "680",
-+      "members": [
-+        {
-+          "name": "iops-total",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-total-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-total-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-read",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-read-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-read-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-write",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-write-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-write-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-total",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-total-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-total-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-read",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-read-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-read-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-write",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-write-max",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bps-write-max-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iops-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "681",
-+      "members": [
-+        {
-+          "name": "client"
-+        },
-+        {
-+          "name": "server"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "client",
-+        "server"
-+      ]
-+    },
-+    {
-+      "name": "682",
-+      "members": [
-+        {
-+          "name": "uninitialized"
-+        },
-+        {
-+          "name": "stopped"
-+        },
-+        {
-+          "name": "check-stop"
-+        },
-+        {
-+          "name": "operating"
-+        },
-+        {
-+          "name": "load"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "uninitialized",
-+        "stopped",
-+        "check-stop",
-+        "operating",
-+        "load"
-+      ]
-+    },
-+    {
-+      "name": "683",
-+      "members": [
-+        {
-+          "name": "memory"
-+        },
-+        {
-+          "name": "first-level"
-+        },
-+        {
-+          "name": "second-level"
-+        },
-+        {
-+          "name": "third-level"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "memory",
-+        "first-level",
-+        "second-level",
-+        "third-level"
-+      ]
-+    },
-+    {
-+      "name": "684",
-+      "members": [
-+        {
-+          "name": "access-latency"
-+        },
-+        {
-+          "name": "read-latency"
-+        },
-+        {
-+          "name": "write-latency"
-+        },
-+        {
-+          "name": "access-bandwidth"
-+        },
-+        {
-+          "name": "read-bandwidth"
-+        },
-+        {
-+          "name": "write-bandwidth"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "access-latency",
-+        "read-latency",
-+        "write-latency",
-+        "access-bandwidth",
-+        "read-bandwidth",
-+        "write-bandwidth"
-+      ]
-+    },
-+    {
-+      "name": "685",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "direct"
-+        },
-+        {
-+          "name": "complex"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "direct",
-+        "complex"
-+      ]
-+    },
-+    {
-+      "name": "686",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "write-back"
-+        },
-+        {
-+          "name": "write-through"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "write-back",
-+        "write-through"
-+      ]
-+    },
-+    {
-+      "name": "687",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "addr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "int"
-+        },
-+        {
-+          "name": "node",
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "type": "str"
-+        },
-+        {
-+          "name": "hotplugged",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "hotpluggable",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "688",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "memaddr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "689",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "memaddr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "requested-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "node",
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "690",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "memaddr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "node",
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "691",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "memaddr",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "memdev",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "692",
-+      "members": [
-+        {
-+          "name": "string"
-+        },
-+        {
-+          "name": "boolean"
-+        },
-+        {
-+          "name": "number"
-+        },
-+        {
-+          "name": "size"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "string",
-+        "boolean",
-+        "number",
-+        "size"
-+      ]
-+    },
-+    {
-+      "name": "693",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "775"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "694",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "775"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "dev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "period-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "try-poll",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "695",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "775"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "buffer-count",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "696",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "775"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "server-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "client-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "connect-ports",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "start-server",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "exact-name",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "697",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "775"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "dev",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "buffer-count",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "try-poll",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "698",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "775"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "stream-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "latency",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "699",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "775"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "stream-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "latency",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "700",
-+      "members": [
-+        {
-+          "name": "mixing-engine",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fixed-settings",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "frequency",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "voices",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "775"
-+        },
-+        {
-+          "name": "buffer-length",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "buffer-count",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "701",
-+      "members": [
-+        {
-+          "name": "desc",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "class",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "702",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vendor",
-+          "type": "int"
-+        },
-+        {
-+          "name": "subsystem",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "subsystem-vendor",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "703",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "776"
-+        },
-+        {
-+          "name": "devices",
-+          "default": null,
-+          "type": "[550]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[704]",
-+      "element-type": "704",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "704",
-+      "members": [
-+        {
-+          "name": "bar",
-+          "type": "int"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "address",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "prefetch",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "mem_type_64",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "705",
-+      "members": [
-+        {
-+          "type": "int"
-+        },
-+        {
-+          "type": "bool"
-+        },
-+        {
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "706",
-+      "members": [
-+        {
-+          "name": "cumulative"
-+        },
-+        {
-+          "name": "instant"
-+        },
-+        {
-+          "name": "peak"
-+        },
-+        {
-+          "name": "linear-histogram"
-+        },
-+        {
-+          "name": "log2-histogram"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "cumulative",
-+        "instant",
-+        "peak",
-+        "linear-histogram",
-+        "log2-histogram"
-+      ]
-+    },
-+    {
-+      "name": "707",
-+      "members": [
-+        {
-+          "name": "bytes"
-+        },
-+        {
-+          "name": "seconds"
-+        },
-+        {
-+          "name": "cycles"
-+        },
-+        {
-+          "name": "boolean"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "bytes",
-+        "seconds",
-+        "cycles",
-+        "boolean"
-+      ]
-+    },
-+    {
-+      "name": "708",
-+      "members": [
-+        {
-+          "name": "protocols",
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "unknown-protocols",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "709",
-+      "members": [
-+        {
-+          "name": "builtin"
-+        },
-+        {
-+          "name": "vhost-user"
-+        },
-+        {
-+          "name": "lkcf"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "builtin",
-+        "vhost-user",
-+        "lkcf"
-+      ]
-+    },
-+    {
-+      "name": "710",
-+      "members": [
-+        {
-+          "name": "cache-data-parity"
-+        },
-+        {
-+          "name": "cache-address-parity"
-+        },
-+        {
-+          "name": "cache-be-parity"
-+        },
-+        {
-+          "name": "cache-data-ecc"
-+        },
-+        {
-+          "name": "mem-data-parity"
-+        },
-+        {
-+          "name": "mem-address-parity"
-+        },
-+        {
-+          "name": "mem-be-parity"
-+        },
-+        {
-+          "name": "mem-data-ecc"
-+        },
-+        {
-+          "name": "reinit-threshold"
-+        },
-+        {
-+          "name": "rsvd-encoding"
-+        },
-+        {
-+          "name": "poison-received"
-+        },
-+        {
-+          "name": "receiver-overflow"
-+        },
-+        {
-+          "name": "internal"
-+        },
-+        {
-+          "name": "cxl-ide-tx"
-+        },
-+        {
-+          "name": "cxl-ide-rx"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "cache-data-parity",
-+        "cache-address-parity",
-+        "cache-be-parity",
-+        "cache-data-ecc",
-+        "mem-data-parity",
-+        "mem-address-parity",
-+        "mem-be-parity",
-+        "mem-data-ecc",
-+        "reinit-threshold",
-+        "rsvd-encoding",
-+        "poison-received",
-+        "receiver-overflow",
-+        "internal",
-+        "cxl-ide-tx",
-+        "cxl-ide-rx"
-+      ]
-+    },
-+    {
-+      "name": "711",
-+      "members": [
-+        {
-+          "name": "unknown"
-+        },
-+        {
-+          "name": "disabled-wait"
-+        },
-+        {
-+          "name": "extint-loop"
-+        },
-+        {
-+          "name": "pgmint-loop"
-+        },
-+        {
-+          "name": "opint-loop"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "unknown",
-+        "disabled-wait",
-+        "extint-loop",
-+        "pgmint-loop",
-+        "opint-loop"
-+      ]
-+    },
-+    {
-+      "name": "712",
-+      "members": [
-+        {
-+          "name": "qcow2"
-+        },
-+        {
-+          "name": "vmdk"
-+        },
-+        {
-+          "name": "luks"
-+        },
-+        {
-+          "name": "rbd"
-+        },
-+        {
-+          "name": "file"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "qcow2",
-+        "vmdk",
-+        "luks",
-+        "rbd",
-+        "file"
-+      ]
-+    },
-+    {
-+      "name": "713",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "777"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "714",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "778"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "715",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "779"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "716",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "780"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "717",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "781"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "718",
-+      "members": [
-+        {
-+          "name": "l1_update"
-+        },
-+        {
-+          "name": "l1_grow_alloc_table"
-+        },
-+        {
-+          "name": "l1_grow_write_table"
-+        },
-+        {
-+          "name": "l1_grow_activate_table"
-+        },
-+        {
-+          "name": "l2_load"
-+        },
-+        {
-+          "name": "l2_update"
-+        },
-+        {
-+          "name": "l2_update_compressed"
-+        },
-+        {
-+          "name": "l2_alloc_cow_read"
-+        },
-+        {
-+          "name": "l2_alloc_write"
-+        },
-+        {
-+          "name": "read_aio"
-+        },
-+        {
-+          "name": "read_backing_aio"
-+        },
-+        {
-+          "name": "read_compressed"
-+        },
-+        {
-+          "name": "write_aio"
-+        },
-+        {
-+          "name": "write_compressed"
-+        },
-+        {
-+          "name": "vmstate_load"
-+        },
-+        {
-+          "name": "vmstate_save"
-+        },
-+        {
-+          "name": "cow_read"
-+        },
-+        {
-+          "name": "cow_write"
-+        },
-+        {
-+          "name": "reftable_load"
-+        },
-+        {
-+          "name": "reftable_grow"
-+        },
-+        {
-+          "name": "reftable_update"
-+        },
-+        {
-+          "name": "refblock_load"
-+        },
-+        {
-+          "name": "refblock_update"
-+        },
-+        {
-+          "name": "refblock_update_part"
-+        },
-+        {
-+          "name": "refblock_alloc"
-+        },
-+        {
-+          "name": "refblock_alloc_hookup"
-+        },
-+        {
-+          "name": "refblock_alloc_write"
-+        },
-+        {
-+          "name": "refblock_alloc_write_blocks"
-+        },
-+        {
-+          "name": "refblock_alloc_write_table"
-+        },
-+        {
-+          "name": "refblock_alloc_switch_table"
-+        },
-+        {
-+          "name": "cluster_alloc"
-+        },
-+        {
-+          "name": "cluster_alloc_bytes"
-+        },
-+        {
-+          "name": "cluster_free"
-+        },
-+        {
-+          "name": "flush_to_os"
-+        },
-+        {
-+          "name": "flush_to_disk"
-+        },
-+        {
-+          "name": "pwritev_rmw_head"
-+        },
-+        {
-+          "name": "pwritev_rmw_after_head"
-+        },
-+        {
-+          "name": "pwritev_rmw_tail"
-+        },
-+        {
-+          "name": "pwritev_rmw_after_tail"
-+        },
-+        {
-+          "name": "pwritev"
-+        },
-+        {
-+          "name": "pwritev_zero"
-+        },
-+        {
-+          "name": "pwritev_done"
-+        },
-+        {
-+          "name": "empty_image_prepare"
-+        },
-+        {
-+          "name": "l1_shrink_write_table"
-+        },
-+        {
-+          "name": "l1_shrink_free_l2_clusters"
-+        },
-+        {
-+          "name": "cor_write"
-+        },
-+        {
-+          "name": "cluster_alloc_space"
-+        },
-+        {
-+          "name": "none"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "l1_update",
-+        "l1_grow_alloc_table",
-+        "l1_grow_write_table",
-+        "l1_grow_activate_table",
-+        "l2_load",
-+        "l2_update",
-+        "l2_update_compressed",
-+        "l2_alloc_cow_read",
-+        "l2_alloc_write",
-+        "read_aio",
-+        "read_backing_aio",
-+        "read_compressed",
-+        "write_aio",
-+        "write_compressed",
-+        "vmstate_load",
-+        "vmstate_save",
-+        "cow_read",
-+        "cow_write",
-+        "reftable_load",
-+        "reftable_grow",
-+        "reftable_update",
-+        "refblock_load",
-+        "refblock_update",
-+        "refblock_update_part",
-+        "refblock_alloc",
-+        "refblock_alloc_hookup",
-+        "refblock_alloc_write",
-+        "refblock_alloc_write_blocks",
-+        "refblock_alloc_write_table",
-+        "refblock_alloc_switch_table",
-+        "cluster_alloc",
-+        "cluster_alloc_bytes",
-+        "cluster_free",
-+        "flush_to_os",
-+        "flush_to_disk",
-+        "pwritev_rmw_head",
-+        "pwritev_rmw_after_head",
-+        "pwritev_rmw_tail",
-+        "pwritev_rmw_after_tail",
-+        "pwritev",
-+        "pwritev_zero",
-+        "pwritev_done",
-+        "empty_image_prepare",
-+        "l1_shrink_write_table",
-+        "l1_shrink_free_l2_clusters",
-+        "cor_write",
-+        "cluster_alloc_space",
-+        "none"
-+      ]
-+    },
-+    {
-+      "name": "719",
-+      "members": [
-+        {
-+          "name": "read"
-+        },
-+        {
-+          "name": "write"
-+        },
-+        {
-+          "name": "write-zeroes"
-+        },
-+        {
-+          "name": "discard"
-+        },
-+        {
-+          "name": "flush"
-+        },
-+        {
-+          "name": "block-status"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "read",
-+        "write",
-+        "write-zeroes",
-+        "discard",
-+        "flush",
-+        "block-status"
-+      ]
-+    },
-+    {
-+      "name": "720",
-+      "members": [
-+        {
-+          "name": "inet"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "inet"
-+      ]
-+    },
-+    {
-+      "name": "721",
-+      "members": [
-+        {
-+          "name": "template",
-+          "default": null,
-+          "type": "722"
-+        },
-+        {
-+          "name": "main-header",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "active-l1",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "active-l2",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "refcount-table",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "refcount-block",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "snapshot-table",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "inactive-l1",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "inactive-l2",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "bitmap-directory",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "722",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "constant"
-+        },
-+        {
-+          "name": "cached"
-+        },
-+        {
-+          "name": "all"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "constant",
-+        "cached",
-+        "all"
-+      ]
-+    },
-+    {
-+      "name": "723",
-+      "members": [
-+        {
-+          "name": "aes"
-+        },
-+        {
-+          "name": "luks"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "aes",
-+        "luks"
-+      ]
-+    },
-+    {
-+      "name": "724",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "725",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "726",
-+      "members": [
-+        {
-+          "name": "aes"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "aes"
-+      ]
-+    },
-+    {
-+      "name": "727",
-+      "members": [
-+        {
-+          "name": "luks"
-+        },
-+        {
-+          "name": "luks2"
-+        },
-+        {
-+          "name": "luks-any"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "luks",
-+        "luks2",
-+        "luks-any"
-+      ]
-+    },
-+    {
-+      "name": "728",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "729",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "730",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "731",
-+      "members": [
-+        {
-+          "name": "none"
-+        },
-+        {
-+          "name": "hash"
-+        },
-+        {
-+          "name": "known_hosts"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "hash",
-+        "known_hosts"
-+      ]
-+    },
-+    {
-+      "name": "732",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "782"
-+        },
-+        {
-+          "name": "hash",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "733",
-+      "members": [
-+        {
-+          "name": "off"
-+        },
-+        {
-+          "name": "metadata"
-+        },
-+        {
-+          "name": "falloc"
-+        },
-+        {
-+          "name": "full"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "metadata",
-+        "falloc",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "734",
-+      "members": [
-+        {
-+          "name": "aes-128"
-+        },
-+        {
-+          "name": "aes-192"
-+        },
-+        {
-+          "name": "aes-256"
-+        },
-+        {
-+          "name": "des"
-+        },
-+        {
-+          "name": "3des"
-+        },
-+        {
-+          "name": "cast5-128"
-+        },
-+        {
-+          "name": "serpent-128"
-+        },
-+        {
-+          "name": "serpent-192"
-+        },
-+        {
-+          "name": "serpent-256"
-+        },
-+        {
-+          "name": "twofish-128"
-+        },
-+        {
-+          "name": "twofish-192"
-+        },
-+        {
-+          "name": "twofish-256"
-+        },
-+        {
-+          "name": "sm4"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "aes-128",
-+        "aes-192",
-+        "aes-256",
-+        "des",
-+        "3des",
-+        "cast5-128",
-+        "serpent-128",
-+        "serpent-192",
-+        "serpent-256",
-+        "twofish-128",
-+        "twofish-192",
-+        "twofish-256",
-+        "sm4"
-+      ]
-+    },
-+    {
-+      "name": "735",
-+      "members": [
-+        {
-+          "name": "ecb"
-+        },
-+        {
-+          "name": "cbc"
-+        },
-+        {
-+          "name": "xts"
-+        },
-+        {
-+          "name": "ctr"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ecb",
-+        "cbc",
-+        "xts",
-+        "ctr"
-+      ]
-+    },
-+    {
-+      "name": "736",
-+      "members": [
-+        {
-+          "name": "plain"
-+        },
-+        {
-+          "name": "plain64"
-+        },
-+        {
-+          "name": "essiv"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "plain",
-+        "plain64",
-+        "essiv"
-+      ]
-+    },
-+    {
-+      "name": "737",
-+      "members": [
-+        {
-+          "name": "md5"
-+        },
-+        {
-+          "name": "sha1"
-+        },
-+        {
-+          "name": "sha224"
-+        },
-+        {
-+          "name": "sha256"
-+        },
-+        {
-+          "name": "sha384"
-+        },
-+        {
-+          "name": "sha512"
-+        },
-+        {
-+          "name": "ripemd160"
-+        },
-+        {
-+          "name": "sm3"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "md5",
-+        "sha1",
-+        "sha224",
-+        "sha256",
-+        "sha384",
-+        "sha512",
-+        "ripemd160",
-+        "sm3"
-+      ]
-+    },
-+    {
-+      "name": "738",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "qcow",
-+          "type": "724"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "784"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "783"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "739",
-+      "members": [
-+        {
-+          "name": "v2"
-+        },
-+        {
-+          "name": "v3"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "v2",
-+        "v3"
-+      ]
-+    },
-+    {
-+      "name": "740",
-+      "members": [
-+        {
-+          "name": "zlib"
-+        },
-+        {
-+          "name": "zstd"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "zlib",
-+        "zstd"
-+      ]
-+    },
-+    {
-+      "name": "741",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "luks",
-+          "type": "785"
-+        },
-+        {
-+          "case": "luks2",
-+          "type": "786"
-+        },
-+        {
-+          "case": "luks-any",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "727"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "742",
-+      "members": [
-+        {
-+          "name": "dynamic"
-+        },
-+        {
-+          "name": "fixed"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "dynamic",
-+        "fixed"
-+      ]
-+    },
-+    {
-+      "name": "743",
-+      "members": [
-+        {
-+          "name": "monolithicSparse"
-+        },
-+        {
-+          "name": "monolithicFlat"
-+        },
-+        {
-+          "name": "twoGbMaxExtentSparse"
-+        },
-+        {
-+          "name": "twoGbMaxExtentFlat"
-+        },
-+        {
-+          "name": "streamOptimized"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "monolithicSparse",
-+        "monolithicFlat",
-+        "twoGbMaxExtentSparse",
-+        "twoGbMaxExtentFlat",
-+        "streamOptimized"
-+      ]
-+    },
-+    {
-+      "name": "744",
-+      "members": [
-+        {
-+          "name": "ide"
-+        },
-+        {
-+          "name": "buslogic"
-+        },
-+        {
-+          "name": "lsilogic"
-+        },
-+        {
-+          "name": "legacyESX"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "ide",
-+        "buslogic",
-+        "lsilogic",
-+        "legacyESX"
-+      ]
-+    },
-+    {
-+      "name": "745",
-+      "members": [
-+        {
-+          "name": "dynamic"
-+        },
-+        {
-+          "name": "fixed"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "dynamic",
-+        "fixed"
-+      ]
-+    },
-+    {
-+      "name": "746",
-+      "members": [
-+        {
-+          "name": "active"
-+        },
-+        {
-+          "name": "inactive"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "active",
-+        "inactive"
-+      ]
-+    },
-+    {
-+      "name": "747",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "luks",
-+          "type": "787"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "783"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "748",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "in",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "out",
-+          "type": "str"
-+        },
-+        {
-+          "name": "append",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "749",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "750",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "addr",
-+          "type": "361"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "wait",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "nodelay",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "telnet",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "tn3270",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "websocket",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reconnect",
-+          "default": null,
-+          "type": "int",
-+          "features": [
-+            "deprecated"
-+          ]
-+        },
-+        {
-+          "name": "reconnect-ms",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "751",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "remote",
-+          "type": "361"
-+        },
-+        {
-+          "name": "local",
-+          "default": null,
-+          "type": "361"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "752",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "753",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "754",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "755",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "signal",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "759",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "760",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "width",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "height",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cols",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "rows",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "761",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "762",
-+      "members": [
-+        {
-+          "name": "path",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cancel-path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "763",
-+      "members": [
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "764",
-+      "members": [
-+        {
-+          "name": "unmapped"
-+        },
-+        {
-+          "name": "shift"
-+        },
-+        {
-+          "name": "shift_r"
-+        },
-+        {
-+          "name": "alt"
-+        },
-+        {
-+          "name": "alt_r"
-+        },
-+        {
-+          "name": "ctrl"
-+        },
-+        {
-+          "name": "ctrl_r"
-+        },
-+        {
-+          "name": "menu"
-+        },
-+        {
-+          "name": "esc"
-+        },
-+        {
-+          "name": "1"
-+        },
-+        {
-+          "name": "2"
-+        },
-+        {
-+          "name": "3"
-+        },
-+        {
-+          "name": "4"
-+        },
-+        {
-+          "name": "5"
-+        },
-+        {
-+          "name": "6"
-+        },
-+        {
-+          "name": "7"
-+        },
-+        {
-+          "name": "8"
-+        },
-+        {
-+          "name": "9"
-+        },
-+        {
-+          "name": "0"
-+        },
-+        {
-+          "name": "minus"
-+        },
-+        {
-+          "name": "equal"
-+        },
-+        {
-+          "name": "backspace"
-+        },
-+        {
-+          "name": "tab"
-+        },
-+        {
-+          "name": "q"
-+        },
-+        {
-+          "name": "w"
-+        },
-+        {
-+          "name": "e"
-+        },
-+        {
-+          "name": "r"
-+        },
-+        {
-+          "name": "t"
-+        },
-+        {
-+          "name": "y"
-+        },
-+        {
-+          "name": "u"
-+        },
-+        {
-+          "name": "i"
-+        },
-+        {
-+          "name": "o"
-+        },
-+        {
-+          "name": "p"
-+        },
-+        {
-+          "name": "bracket_left"
-+        },
-+        {
-+          "name": "bracket_right"
-+        },
-+        {
-+          "name": "ret"
-+        },
-+        {
-+          "name": "a"
-+        },
-+        {
-+          "name": "s"
-+        },
-+        {
-+          "name": "d"
-+        },
-+        {
-+          "name": "f"
-+        },
-+        {
-+          "name": "g"
-+        },
-+        {
-+          "name": "h"
-+        },
-+        {
-+          "name": "j"
-+        },
-+        {
-+          "name": "k"
-+        },
-+        {
-+          "name": "l"
-+        },
-+        {
-+          "name": "semicolon"
-+        },
-+        {
-+          "name": "apostrophe"
-+        },
-+        {
-+          "name": "grave_accent"
-+        },
-+        {
-+          "name": "backslash"
-+        },
-+        {
-+          "name": "z"
-+        },
-+        {
-+          "name": "x"
-+        },
-+        {
-+          "name": "c"
-+        },
-+        {
-+          "name": "v"
-+        },
-+        {
-+          "name": "b"
-+        },
-+        {
-+          "name": "n"
-+        },
-+        {
-+          "name": "m"
-+        },
-+        {
-+          "name": "comma"
-+        },
-+        {
-+          "name": "dot"
-+        },
-+        {
-+          "name": "slash"
-+        },
-+        {
-+          "name": "asterisk"
-+        },
-+        {
-+          "name": "spc"
-+        },
-+        {
-+          "name": "caps_lock"
-+        },
-+        {
-+          "name": "f1"
-+        },
-+        {
-+          "name": "f2"
-+        },
-+        {
-+          "name": "f3"
-+        },
-+        {
-+          "name": "f4"
-+        },
-+        {
-+          "name": "f5"
-+        },
-+        {
-+          "name": "f6"
-+        },
-+        {
-+          "name": "f7"
-+        },
-+        {
-+          "name": "f8"
-+        },
-+        {
-+          "name": "f9"
-+        },
-+        {
-+          "name": "f10"
-+        },
-+        {
-+          "name": "num_lock"
-+        },
-+        {
-+          "name": "scroll_lock"
-+        },
-+        {
-+          "name": "kp_divide"
-+        },
-+        {
-+          "name": "kp_multiply"
-+        },
-+        {
-+          "name": "kp_subtract"
-+        },
-+        {
-+          "name": "kp_add"
-+        },
-+        {
-+          "name": "kp_enter"
-+        },
-+        {
-+          "name": "kp_decimal"
-+        },
-+        {
-+          "name": "sysrq"
-+        },
-+        {
-+          "name": "kp_0"
-+        },
-+        {
-+          "name": "kp_1"
-+        },
-+        {
-+          "name": "kp_2"
-+        },
-+        {
-+          "name": "kp_3"
-+        },
-+        {
-+          "name": "kp_4"
-+        },
-+        {
-+          "name": "kp_5"
-+        },
-+        {
-+          "name": "kp_6"
-+        },
-+        {
-+          "name": "kp_7"
-+        },
-+        {
-+          "name": "kp_8"
-+        },
-+        {
-+          "name": "kp_9"
-+        },
-+        {
-+          "name": "less"
-+        },
-+        {
-+          "name": "f11"
-+        },
-+        {
-+          "name": "f12"
-+        },
-+        {
-+          "name": "print"
-+        },
-+        {
-+          "name": "home"
-+        },
-+        {
-+          "name": "pgup"
-+        },
-+        {
-+          "name": "pgdn"
-+        },
-+        {
-+          "name": "end"
-+        },
-+        {
-+          "name": "left"
-+        },
-+        {
-+          "name": "up"
-+        },
-+        {
-+          "name": "down"
-+        },
-+        {
-+          "name": "right"
-+        },
-+        {
-+          "name": "insert"
-+        },
-+        {
-+          "name": "delete"
-+        },
-+        {
-+          "name": "stop"
-+        },
-+        {
-+          "name": "again"
-+        },
-+        {
-+          "name": "props"
-+        },
-+        {
-+          "name": "undo"
-+        },
-+        {
-+          "name": "front"
-+        },
-+        {
-+          "name": "copy"
-+        },
-+        {
-+          "name": "open"
-+        },
-+        {
-+          "name": "paste"
-+        },
-+        {
-+          "name": "find"
-+        },
-+        {
-+          "name": "cut"
-+        },
-+        {
-+          "name": "lf"
-+        },
-+        {
-+          "name": "help"
-+        },
-+        {
-+          "name": "meta_l"
-+        },
-+        {
-+          "name": "meta_r"
-+        },
-+        {
-+          "name": "compose"
-+        },
-+        {
-+          "name": "pause"
-+        },
-+        {
-+          "name": "ro"
-+        },
-+        {
-+          "name": "hiragana"
-+        },
-+        {
-+          "name": "henkan"
-+        },
-+        {
-+          "name": "yen"
-+        },
-+        {
-+          "name": "muhenkan"
-+        },
-+        {
-+          "name": "katakanahiragana"
-+        },
-+        {
-+          "name": "kp_comma"
-+        },
-+        {
-+          "name": "kp_equals"
-+        },
-+        {
-+          "name": "power"
-+        },
-+        {
-+          "name": "sleep"
-+        },
-+        {
-+          "name": "wake"
-+        },
-+        {
-+          "name": "audionext"
-+        },
-+        {
-+          "name": "audioprev"
-+        },
-+        {
-+          "name": "audiostop"
-+        },
-+        {
-+          "name": "audioplay"
-+        },
-+        {
-+          "name": "audiomute"
-+        },
-+        {
-+          "name": "volumeup"
-+        },
-+        {
-+          "name": "volumedown"
-+        },
-+        {
-+          "name": "mediaselect"
-+        },
-+        {
-+          "name": "mail"
-+        },
-+        {
-+          "name": "calculator"
-+        },
-+        {
-+          "name": "computer"
-+        },
-+        {
-+          "name": "ac_home"
-+        },
-+        {
-+          "name": "ac_back"
-+        },
-+        {
-+          "name": "ac_forward"
-+        },
-+        {
-+          "name": "ac_refresh"
-+        },
-+        {
-+          "name": "ac_bookmarks"
-+        },
-+        {
-+          "name": "lang1"
-+        },
-+        {
-+          "name": "lang2"
-+        },
-+        {
-+          "name": "f13"
-+        },
-+        {
-+          "name": "f14"
-+        },
-+        {
-+          "name": "f15"
-+        },
-+        {
-+          "name": "f16"
-+        },
-+        {
-+          "name": "f17"
-+        },
-+        {
-+          "name": "f18"
-+        },
-+        {
-+          "name": "f19"
-+        },
-+        {
-+          "name": "f20"
-+        },
-+        {
-+          "name": "f21"
-+        },
-+        {
-+          "name": "f22"
-+        },
-+        {
-+          "name": "f23"
-+        },
-+        {
-+          "name": "f24"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "unmapped",
-+        "shift",
-+        "shift_r",
-+        "alt",
-+        "alt_r",
-+        "ctrl",
-+        "ctrl_r",
-+        "menu",
-+        "esc",
-+        "1",
-+        "2",
-+        "3",
-+        "4",
-+        "5",
-+        "6",
-+        "7",
-+        "8",
-+        "9",
-+        "0",
-+        "minus",
-+        "equal",
-+        "backspace",
-+        "tab",
-+        "q",
-+        "w",
-+        "e",
-+        "r",
-+        "t",
-+        "y",
-+        "u",
-+        "i",
-+        "o",
-+        "p",
-+        "bracket_left",
-+        "bracket_right",
-+        "ret",
-+        "a",
-+        "s",
-+        "d",
-+        "f",
-+        "g",
-+        "h",
-+        "j",
-+        "k",
-+        "l",
-+        "semicolon",
-+        "apostrophe",
-+        "grave_accent",
-+        "backslash",
-+        "z",
-+        "x",
-+        "c",
-+        "v",
-+        "b",
-+        "n",
-+        "m",
-+        "comma",
-+        "dot",
-+        "slash",
-+        "asterisk",
-+        "spc",
-+        "caps_lock",
-+        "f1",
-+        "f2",
-+        "f3",
-+        "f4",
-+        "f5",
-+        "f6",
-+        "f7",
-+        "f8",
-+        "f9",
-+        "f10",
-+        "num_lock",
-+        "scroll_lock",
-+        "kp_divide",
-+        "kp_multiply",
-+        "kp_subtract",
-+        "kp_add",
-+        "kp_enter",
-+        "kp_decimal",
-+        "sysrq",
-+        "kp_0",
-+        "kp_1",
-+        "kp_2",
-+        "kp_3",
-+        "kp_4",
-+        "kp_5",
-+        "kp_6",
-+        "kp_7",
-+        "kp_8",
-+        "kp_9",
-+        "less",
-+        "f11",
-+        "f12",
-+        "print",
-+        "home",
-+        "pgup",
-+        "pgdn",
-+        "end",
-+        "left",
-+        "up",
-+        "down",
-+        "right",
-+        "insert",
-+        "delete",
-+        "stop",
-+        "again",
-+        "props",
-+        "undo",
-+        "front",
-+        "copy",
-+        "open",
-+        "paste",
-+        "find",
-+        "cut",
-+        "lf",
-+        "help",
-+        "meta_l",
-+        "meta_r",
-+        "compose",
-+        "pause",
-+        "ro",
-+        "hiragana",
-+        "henkan",
-+        "yen",
-+        "muhenkan",
-+        "katakanahiragana",
-+        "kp_comma",
-+        "kp_equals",
-+        "power",
-+        "sleep",
-+        "wake",
-+        "audionext",
-+        "audioprev",
-+        "audiostop",
-+        "audioplay",
-+        "audiomute",
-+        "volumeup",
-+        "volumedown",
-+        "mediaselect",
-+        "mail",
-+        "calculator",
-+        "computer",
-+        "ac_home",
-+        "ac_back",
-+        "ac_forward",
-+        "ac_refresh",
-+        "ac_bookmarks",
-+        "lang1",
-+        "lang2",
-+        "f13",
-+        "f14",
-+        "f15",
-+        "f16",
-+        "f17",
-+        "f18",
-+        "f19",
-+        "f20",
-+        "f21",
-+        "f22",
-+        "f23",
-+        "f24"
-+      ]
-+    },
-+    {
-+      "name": "765",
-+      "members": [
-+        {
-+          "name": "key",
-+          "type": "415"
-+        },
-+        {
-+          "name": "down",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "766",
-+      "members": [
-+        {
-+          "name": "button",
-+          "type": "788"
-+        },
-+        {
-+          "name": "down",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "767",
-+      "members": [
-+        {
-+          "name": "axis",
-+          "type": "789"
-+        },
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "768",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "790"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "int"
-+        },
-+        {
-+          "name": "tracking-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "axis",
-+          "type": "789"
-+        },
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "769",
-+      "members": [
-+        {
-+          "name": "persistent",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "770",
-+      "members": [
-+        {
-+          "name": "socket"
-+        },
-+        {
-+          "name": "exec"
-+        },
-+        {
-+          "name": "rdma"
-+        },
-+        {
-+          "name": "file"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "socket",
-+        "exec",
-+        "rdma",
-+        "file"
-+      ]
-+    },
-+    {
-+      "name": "771",
-+      "members": [
-+        {
-+          "name": "args",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "772",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "773",
-+      "members": [],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "774",
-+      "members": [
-+        {
-+          "name": "exact"
-+        },
-+        {
-+          "name": "glob"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "exact",
-+        "glob"
-+      ]
-+    },
-+    {
-+      "name": "775",
-+      "members": [
-+        {
-+          "name": "u8"
-+        },
-+        {
-+          "name": "s8"
-+        },
-+        {
-+          "name": "u16"
-+        },
-+        {
-+          "name": "s16"
-+        },
-+        {
-+          "name": "u32"
-+        },
-+        {
-+          "name": "s32"
-+        },
-+        {
-+          "name": "f32"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "u8",
-+        "s8",
-+        "u16",
-+        "s16",
-+        "u32",
-+        "s32",
-+        "f32"
-+      ]
-+    },
-+    {
-+      "name": "776",
-+      "members": [
-+        {
-+          "name": "number",
-+          "type": "int"
-+        },
-+        {
-+          "name": "secondary",
-+          "type": "int"
-+        },
-+        {
-+          "name": "subordinate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "io_range",
-+          "type": "791"
-+        },
-+        {
-+          "name": "memory_range",
-+          "type": "791"
-+        },
-+        {
-+          "name": "prefetchable_range",
-+          "type": "791"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "777",
-+      "members": [
-+        {
-+          "name": "compat",
-+          "type": "str"
-+        },
-+        {
-+          "name": "data-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "data-file-raw",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "extended-l2",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "lazy-refcounts",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "corrupt",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "refcount-bits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "792"
-+        },
-+        {
-+          "name": "bitmaps",
-+          "default": null,
-+          "type": "[793]"
-+        },
-+        {
-+          "name": "compression-type",
-+          "type": "740"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "778",
-+      "members": [
-+        {
-+          "name": "create-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cid",
-+          "type": "int"
-+        },
-+        {
-+          "name": "parent-cid",
-+          "type": "int"
-+        },
-+        {
-+          "name": "extents",
-+          "type": "[794]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "779",
-+      "members": [
-+        {
-+          "name": "cipher-alg",
-+          "type": "734"
-+        },
-+        {
-+          "name": "cipher-mode",
-+          "type": "735"
-+        },
-+        {
-+          "name": "ivgen-alg",
-+          "type": "736"
-+        },
-+        {
-+          "name": "ivgen-hash-alg",
-+          "default": null,
-+          "type": "737"
-+        },
-+        {
-+          "name": "hash-alg",
-+          "type": "737"
-+        },
-+        {
-+          "name": "detached-header",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "payload-offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "master-key-iters",
-+          "type": "int"
-+        },
-+        {
-+          "name": "uuid",
-+          "type": "str"
-+        },
-+        {
-+          "name": "slots",
-+          "type": "[795]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "780",
-+      "members": [
-+        {
-+          "name": "encryption-format",
-+          "default": null,
-+          "type": "727"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "781",
-+      "members": [
-+        {
-+          "name": "extent-size-hint",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "782",
-+      "members": [
-+        {
-+          "name": "md5"
-+        },
-+        {
-+          "name": "sha1"
-+        },
-+        {
-+          "name": "sha256"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "md5",
-+        "sha1",
-+        "sha256"
-+      ]
-+    },
-+    {
-+      "name": "783",
-+      "members": [
-+        {
-+          "name": "qcow"
-+        },
-+        {
-+          "name": "luks"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "qcow",
-+        "luks"
-+      ]
-+    },
-+    {
-+      "name": "784",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cipher-alg",
-+          "default": null,
-+          "type": "734"
-+        },
-+        {
-+          "name": "cipher-mode",
-+          "default": null,
-+          "type": "735"
-+        },
-+        {
-+          "name": "ivgen-alg",
-+          "default": null,
-+          "type": "736"
-+        },
-+        {
-+          "name": "ivgen-hash-alg",
-+          "default": null,
-+          "type": "737"
-+        },
-+        {
-+          "name": "hash-alg",
-+          "default": null,
-+          "type": "737"
-+        },
-+        {
-+          "name": "iter-time",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "785",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cipher-alg",
-+          "default": null,
-+          "type": "734"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "786",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cipher-alg",
-+          "default": null,
-+          "type": "734"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "787",
-+      "members": [
-+        {
-+          "name": "state",
-+          "type": "746"
-+        },
-+        {
-+          "name": "new-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "old-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "keyslot",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "iter-time",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "788",
-+      "members": [
-+        {
-+          "name": "left"
-+        },
-+        {
-+          "name": "middle"
-+        },
-+        {
-+          "name": "right"
-+        },
-+        {
-+          "name": "wheel-up"
-+        },
-+        {
-+          "name": "wheel-down"
-+        },
-+        {
-+          "name": "side"
-+        },
-+        {
-+          "name": "extra"
-+        },
-+        {
-+          "name": "wheel-left"
-+        },
-+        {
-+          "name": "wheel-right"
-+        },
-+        {
-+          "name": "touch"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "left",
-+        "middle",
-+        "right",
-+        "wheel-up",
-+        "wheel-down",
-+        "side",
-+        "extra",
-+        "wheel-left",
-+        "wheel-right",
-+        "touch"
-+      ]
-+    },
-+    {
-+      "name": "789",
-+      "members": [
-+        {
-+          "name": "x"
-+        },
-+        {
-+          "name": "y"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "x",
-+        "y"
-+      ]
-+    },
-+    {
-+      "name": "790",
-+      "members": [
-+        {
-+          "name": "begin"
-+        },
-+        {
-+          "name": "update"
-+        },
-+        {
-+          "name": "end"
-+        },
-+        {
-+          "name": "cancel"
-+        },
-+        {
-+          "name": "data"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "begin",
-+        "update",
-+        "end",
-+        "cancel",
-+        "data"
-+      ]
-+    },
-+    {
-+      "name": "791",
-+      "members": [
-+        {
-+          "name": "base",
-+          "type": "int"
-+        },
-+        {
-+          "name": "limit",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "792",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "luks",
-+          "type": "779"
-+        },
-+        {
-+          "case": "aes",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "723"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[793]",
-+      "element-type": "793",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "793",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "granularity",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flags",
-+          "type": "[796]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[794]",
-+      "element-type": "794",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "794",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "type": "str"
-+        },
-+        {
-+          "name": "virtual-size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "compressed",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[795]",
-+      "element-type": "795",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "795",
-+      "members": [
-+        {
-+          "name": "active",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "iters",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "stripes",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "key-offset",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[796]",
-+      "element-type": "796",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "796",
-+      "members": [
-+        {
-+          "name": "in-use"
-+        },
-+        {
-+          "name": "auto"
-+        }
-+      ],
-+      "meta-type": "enum",
-+      "values": [
-+        "in-use",
-+        "auto"
-+      ]
-+    }
-+  ],
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "execute": "query-kvm",
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "return": {
-+    "enabled": true,
-+    "present": true
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "execute": "qom-list-types",
-+  "id": "libvirt-6"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "vhost-user-vsock-device",
-+      "parent": "vhost-vsock-common"
-+    },
-+    {
-+      "name": "chardev-testdev",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "z13-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "filter-buffer",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "usb-wacom-tablet",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "virtio-9p-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-9.0-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "usb-redir",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "chardev-stdio",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "vhost-vsock-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "pci-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "z990.3-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-rng-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "virtio-crypto-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "virtio-blk-pci-transitional",
-+      "parent": "virtio-blk-pci-base"
-+    },
-+    {
-+      "name": "vhost-user-input-pci",
-+      "parent": "vhost-user-input-pci-base-type"
-+    },
-+    {
-+      "name": "z13-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "usb-hub",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "virtio-blk-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "z990.2-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "chardev-wctablet",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "host-s390x-cpu",
-+      "parent": "max-s390x-cpu"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-3.1-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "resettable-container",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-gpu-gl-device",
-+      "parent": "virtio-gpu-device"
-+    },
-+    {
-+      "name": "qtest-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "vhost-user-vsock-pci",
-+      "parent": "vhost-user-vsock-pci-base"
-+    },
-+    {
-+      "name": "z196.2-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "qemu-text-console",
-+      "parent": "qemu-console"
-+    },
-+    {
-+      "name": "scsi-generic",
-+      "parent": "scsi-device"
-+    },
-+    {
-+      "name": "zpci",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "vhost-user-snd-pci",
-+      "parent": "vhost-user-snd-pci-base"
-+    },
-+    {
-+      "name": "PCIE",
-+      "parent": "PCI"
-+    },
-+    {
-+      "name": "memory-backend-ram",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "virtio-serial-pci-transitional",
-+      "parent": "virtio-serial-pci-base"
-+    },
-+    {
-+      "name": "e1000e",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-pty",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "chardev-serial",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "z14-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "chardev-file",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "z14.2-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-serial-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "usb-host",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "z990.4-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "filter-rewriter",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "vhost-scsi-pci",
-+      "parent": "vhost-scsi-pci-base"
-+    },
-+    {
-+      "name": "z196-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-gpu-pci",
-+      "parent": "virtio-gpu-pci-base-type"
-+    },
-+    {
-+      "name": "z10BC.2-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "vhost-user-vsock-pci-non-transitional",
-+      "parent": "vhost-user-vsock-pci-base"
-+    },
-+    {
-+      "name": "PCI",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "z114-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-9p-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "vhost-user-i2c-device",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "virtio-scsi-pci",
-+      "parent": "virtio-scsi-pci-base"
-+    },
-+    {
-+      "name": "gen16b-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "authz-list-file",
-+      "parent": "authz"
-+    },
-+    {
-+      "name": "usb-audio",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-4.1-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "usb-net",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "CXL",
-+      "parent": "PCIE"
-+    },
-+    {
-+      "name": "vhost-vsock-pci-non-transitional",
-+      "parent": "vhost-vsock-pci-base"
-+    },
-+    {
-+      "name": "vfio-pci-nohotplug",
-+      "parent": "vfio-pci"
-+    },
-+    {
-+      "name": "z890.3-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "memory-region",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "gen16a-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-9p-pci-transitional",
-+      "parent": "virtio-9p-pci-base"
-+    },
-+    {
-+      "name": "virtio-input-host-pci",
-+      "parent": "virtio-input-host-pci-base-type"
-+    },
-+    {
-+      "name": "virtio-mem",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "vhost-user-device-pci",
-+      "parent": "vhost-user-device-pci-base"
-+    },
-+    {
-+      "name": "pr-manager-helper",
-+      "parent": "pr-manager"
-+    },
-+    {
-+      "name": "z990.5-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "thread-context",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-scsi-device",
-+      "parent": "virtio-scsi-common"
-+    },
-+    {
-+      "name": "input-barrier",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "vhost-user-i2c-pci",
-+      "parent": "vhost-user-i2c-pci-base"
-+    },
-+    {
-+      "name": "vhost-user-scsi-pci-non-transitional",
-+      "parent": "vhost-user-scsi-pci-base"
-+    },
-+    {
-+      "name": "s390-storage_attributes-kvm",
-+      "parent": "s390-storage_attributes"
-+    },
-+    {
-+      "name": "s390-iommu-memory-region",
-+      "parent": "iommu-memory-region"
-+    },
-+    {
-+      "name": "z196.2-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-scsi-pci-non-transitional",
-+      "parent": "virtio-scsi-pci-base"
-+    },
-+    {
-+      "name": "migration",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-2.9-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "chardev-udp",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "z9EC.2-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-mouse-pci",
-+      "parent": "virtio-mouse-pci-base-type"
-+    },
-+    {
-+      "name": "chardev-memory",
-+      "parent": "chardev-ringbuf"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-5.1-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "virtio-net-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "zEC12-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "zEC12.2-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "chardev-dbus",
-+      "parent": "chardev-socket"
-+    },
-+    {
-+      "name": "usb-braille",
-+      "parent": "usb-serial-dev"
-+    },
-+    {
-+      "name": "virtio-mem-ccw",
-+      "parent": "virtio-md-ccw"
-+    },
-+    {
-+      "name": "virtio-9p-pci-non-transitional",
-+      "parent": "virtio-9p-pci-base"
-+    },
-+    {
-+      "name": "s390-pci-iommu",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "memory-backend-file",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "vhost-vsock-device",
-+      "parent": "vhost-vsock-common"
-+    },
-+    {
-+      "name": "virtio-tablet-ccw",
-+      "parent": "virtio-input-hid-ccw"
-+    },
-+    {
-+      "name": "vhost-scsi",
-+      "parent": "vhost-scsi-common"
-+    },
-+    {
-+      "name": "usb-tablet",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "s390-sclp-event-facility",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "vhost-user-fs-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "virtio-blk-pci-non-transitional",
-+      "parent": "virtio-blk-pci-base"
-+    },
-+    {
-+      "name": "usb-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-7.1-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "qtest",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "s390-flic-qemu",
-+      "parent": "s390-flic"
-+    },
-+    {
-+      "name": "z9BC-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "tcg-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-2.12-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "virtio-balloon-pci",
-+      "parent": "virtio-balloon-pci-base"
-+    },
-+    {
-+      "name": "virtio-gpu-device",
-+      "parent": "virtio-gpu-base"
-+    },
-+    {
-+      "name": "qio-channel-null",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "z9EC.3-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "z800-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "z14ZR1-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "z890-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "nvme",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vhost-user-backend",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "gen17a-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-6.1-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "virtio-sound-pci",
-+      "parent": "virtio-sound-pci-base-type"
-+    },
-+    {
-+      "name": "memory-backend-memfd",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "z990.4-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "dbus-display",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "z9EC.3-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "vhost-user-gpu-pci",
-+      "parent": "vhost-user-gpu-pci-base-type"
-+    },
-+    {
-+      "name": "virtio-crypto-pci",
-+      "parent": "virtio-crypto-pci-base-type"
-+    },
-+    {
-+      "name": "iothread",
-+      "parent": "event-loop-base"
-+    },
-+    {
-+      "name": "virtio-mem-system-reset",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "System",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "imx.usbphy",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "x-terminal3270",
-+      "parent": "emulated-ccw-3270"
-+    },
-+    {
-+      "name": "virtio-serial-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "x-remote-object",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-8.1-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "z13.2-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "remote-pcihost",
-+      "parent": "pcie-host-bridge"
-+    },
-+    {
-+      "name": "virtio-rng-pci-non-transitional",
-+      "parent": "virtio-rng-pci-base"
-+    },
-+    {
-+      "name": "virtio-serial-pci",
-+      "parent": "virtio-serial-pci-base"
-+    },
-+    {
-+      "name": "main-loop",
-+      "parent": "event-loop-base"
-+    },
-+    {
-+      "name": "z10BC.2-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "gen15a-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "container",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "scsi-cd",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "vhost-user-blk-pci-non-transitional",
-+      "parent": "vhost-user-blk-pci-base"
-+    },
-+    {
-+      "name": "virtio-serial-pci-non-transitional",
-+      "parent": "virtio-serial-pci-base"
-+    },
-+    {
-+      "name": "z14.2-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "zBC12-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "gen16a-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "vhost-user-scsi",
-+      "parent": "vhost-scsi-common"
-+    },
-+    {
-+      "name": "igbvf",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-rng-pci-transitional",
-+      "parent": "virtio-rng-pci-base"
-+    },
-+    {
-+      "name": "virtio-gpu-gl-pci",
-+      "parent": "virtio-gpu-gl-pci-base-type"
-+    },
-+    {
-+      "name": "vhost-vdpa-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "usb-bot",
-+      "parent": "usb-storage-dev"
-+    },
-+    {
-+      "name": "ap-bridge",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "qio-channel-buffer",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-10.0-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "z900.3-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "z196-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-9.1-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "cryptodev-backend-lkcf",
-+      "parent": "cryptodev-backend"
-+    },
-+    {
-+      "name": "vhost-user-fs-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "z990-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "vfio-ap",
-+      "parent": "ap-device"
-+    },
-+    {
-+      "name": "z14-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "z900.2-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-tablet-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "ccid-card-passthru",
-+      "parent": "ccid-card"
-+    },
-+    {
-+      "name": "chardev-parallel",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "chardev-vc",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "cryptodev-backend",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "cryptodev-vhost-user",
-+      "parent": "cryptodev-backend"
-+    },
-+    {
-+      "name": "usb-uas",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "z800-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "z10EC-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-keyboard-pci",
-+      "parent": "virtio-keyboard-pci-base-type"
-+    },
-+    {
-+      "name": "qemu-graphic-console",
-+      "parent": "qemu-console"
-+    },
-+    {
-+      "name": "z14ZR1-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtserialport",
-+      "parent": "virtio-serial-port"
-+    },
-+    {
-+      "name": "usb-mouse",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "filter-redirector",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "ccid-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "vhost-scsi-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "z900-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "vhost-user-scsi-pci",
-+      "parent": "vhost-user-scsi-pci-base"
-+    },
-+    {
-+      "name": "virtio-gpu-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "z10EC.2-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-2.10-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "z10EC.2-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "s390-sclp-events-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "dbus-vmstate",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "sclp-cpu-hotplug",
-+      "parent": "s390-sclp-event-type"
-+    },
-+    {
-+      "name": "tls-creds-x509",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "virtio-blk-pci",
-+      "parent": "virtio-blk-pci-base"
-+    },
-+    {
-+      "name": "usb-ccid",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "virtio-scsi-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "host-iommu-device-iommufd-vfio",
-+      "parent": "host-iommu-device-iommufd"
-+    },
-+    {
-+      "name": "qio-channel-command",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "x-remote-iommu",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "qemu-fixed-text-console",
-+      "parent": "qemu-text-console"
-+    },
-+    {
-+      "name": "vfio-pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-multitouch-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-4.2-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "z900.2-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "qio-net-listener",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "s390-flic",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "vfio-iommu-iommufd",
-+      "parent": "vfio-iommu"
-+    },
-+    {
-+      "name": "qio-channel-websock",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "virtio-iommu-pci",
-+      "parent": "virtio-iommu-pci-base-type"
-+    },
-+    {
-+      "name": "chardev-braille",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "qio-channel-file",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "qio-channel-socket",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "z900-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "sclp",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "vhost-vdpa-device-pci-non-transitional",
-+      "parent": "vhost-vdpa-device-pci-base"
-+    },
-+    {
-+      "name": "z10EC.3-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "chardev-socket",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtual-css-bridge",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "virtio-multitouch-pci",
-+      "parent": "virtio-multitouch-pci-base-type"
-+    },
-+    {
-+      "name": "nvme-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "z990.5-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-net-pci-non-transitional",
-+      "parent": "virtio-net-pci-base"
-+    },
-+    {
-+      "name": "usb-mtp",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "scsi-hd",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "clock",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "usb-kbd",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "virtio-mouse-ccw",
-+      "parent": "virtio-input-hid-ccw"
-+    },
-+    {
-+      "name": "secret",
-+      "parent": "secret_common"
-+    },
-+    {
-+      "name": "base-xhci",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "max-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "filter-replay",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "input-linux",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-net-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "s390-tod-qemu",
-+      "parent": "s390-tod"
-+    },
-+    {
-+      "name": "virtconsole",
-+      "parent": "virtserialport"
-+    },
-+    {
-+      "name": "vhost-user-rng",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "fw_cfg_mem",
-+      "parent": "fw_cfg"
-+    },
-+    {
-+      "name": "ccid-card-emulated",
-+      "parent": "ccid-card"
-+    },
-+    {
-+      "name": "gen15b-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "diag288",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "x-pci-proxy-dev",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-mouse-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-5.2-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "filter-mirror",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "x-remote-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "throttle-group",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-rng-pci",
-+      "parent": "virtio-rng-pci-base"
-+    },
-+    {
-+      "name": "vhost-vdpa-device-pci-transitional",
-+      "parent": "vhost-vdpa-device-pci-base"
-+    },
-+    {
-+      "name": "chardev-gdb",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "vhost-user-gpio-device",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "virtio-scsi-pci-transitional",
-+      "parent": "virtio-scsi-pci-base"
-+    },
-+    {
-+      "name": "iommufd",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "z9BC.2-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "vhost-user-device",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "vfio-iommu-legacy",
-+      "parent": "vfio-iommu"
-+    },
-+    {
-+      "name": "gen15a-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "sclpconsole",
-+      "parent": "s390-sclp-event-type"
-+    },
-+    {
-+      "name": "vhost-user-input",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "virtio-balloon-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "secret_keyring",
-+      "parent": "secret_common"
-+    },
-+    {
-+      "name": "z990.2-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "s390-tod-kvm",
-+      "parent": "s390-tod"
-+    },
-+    {
-+      "name": "z10EC-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-9p-pci",
-+      "parent": "virtio-9p-pci-base"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-7.2-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "gen16b-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "vhost-vsock-pci",
-+      "parent": "vhost-vsock-pci-base"
-+    },
-+    {
-+      "name": "virtio-sound-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "virtio-balloon-pci-non-transitional",
-+      "parent": "virtio-balloon-pci-base"
-+    },
-+    {
-+      "name": "virtio-net-pci-transitional",
-+      "parent": "virtio-net-pci-base"
-+    },
-+    {
-+      "name": "irq",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "z114-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "tls-creds-psk",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "gen17b-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "z9EC-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "usb-storage",
-+      "parent": "usb-storage-dev"
-+    },
-+    {
-+      "name": "vhost-user-blk-pci-transitional",
-+      "parent": "vhost-user-blk-pci-base"
-+    },
-+    {
-+      "name": "chardev-msmouse",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-3.0-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "vhost-scsi-pci-transitional",
-+      "parent": "vhost-scsi-pci-base"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-6.2-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "colo-compare",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "qemu-xhci",
-+      "parent": "pci-xhci"
-+    },
-+    {
-+      "name": "virtio-crypto-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "z13s-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "rng-random",
-+      "parent": "rng-backend"
-+    },
-+    {
-+      "name": "nvme-ns",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "gen17a-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "vhost-user-blk-pci",
-+      "parent": "vhost-user-blk-pci-base"
-+    },
-+    {
-+      "name": "authz-simple",
-+      "parent": "authz"
-+    },
-+    {
-+      "name": "fw_cfg_io",
-+      "parent": "fw_cfg"
-+    },
-+    {
-+      "name": "none-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "u2f-passthru",
-+      "parent": "u2f-key"
-+    },
-+    {
-+      "name": "virtio-serial-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-8.2-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "qemu-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "cryptodev-backend-builtin",
-+      "parent": "cryptodev-backend"
-+    },
-+    {
-+      "name": "ap-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "tls-cipher-suites",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "host-iommu-device-legacy-vfio",
-+      "parent": "host-iommu-device"
-+    },
-+    {
-+      "name": "qio-dns-resolver",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtual-css-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "igb",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "gen15b-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-balloon-pci-transitional",
-+      "parent": "virtio-balloon-pci-base"
-+    },
-+    {
-+      "name": "zEC12-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-keyboard-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "z890.3-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-input-host-device",
-+      "parent": "virtio-input-device"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-4.0-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "s390-skeys-qemu",
-+      "parent": "s390-skeys"
-+    },
-+    {
-+      "name": "s390-skeys-kvm",
-+      "parent": "s390-skeys"
-+    },
-+    {
-+      "name": "z10EC.3-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "memory-region-portio-list",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "z890.2-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "z890.2-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "gen17b-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "kvm-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "s390-storage_attributes-qemu",
-+      "parent": "s390-storage_attributes"
-+    },
-+    {
-+      "name": "vhost-scsi-pci-non-transitional",
-+      "parent": "vhost-scsi-pci-base"
-+    },
-+    {
-+      "name": "qio-channel-rdma",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "virtio-iommu-memory-region",
-+      "parent": "iommu-memory-region"
-+    },
-+    {
-+      "name": "s390-ipl",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "vhost-user-gpio-pci",
-+      "parent": "vhost-user-gpio-pci-base"
-+    },
-+    {
-+      "name": "vhost-user-gpu",
-+      "parent": "virtio-gpu-base"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-9.2-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "z10BC-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "zEC12.2-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "z890-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "virtio-balloon-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "chardev-null",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "vhost-user-rng-pci",
-+      "parent": "vhost-user-rng-pci-base"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-5.0-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "z9BC-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "tls-creds-anon",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "rng-egd",
-+      "parent": "rng-backend"
-+    },
-+    {
-+      "name": "virtio-keyboard-ccw",
-+      "parent": "virtio-input-hid-ccw"
-+    },
-+    {
-+      "name": "virtio-iommu-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "virtio-net-pci",
-+      "parent": "virtio-net-pci-base"
-+    },
-+    {
-+      "name": "z10BC-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "loader",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "usb-serial",
-+      "parent": "usb-serial-dev"
-+    },
-+    {
-+      "name": "memory-backend-shm",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "virtio-mem-pci",
-+      "parent": "virtio-mem-pci-base"
-+    },
-+    {
-+      "name": "z9EC-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-7.0-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "accel",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-tablet-pci",
-+      "parent": "virtio-tablet-pci-base-type"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-2.11-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "sclplmconsole",
-+      "parent": "s390-sclp-event-type"
-+    },
-+    {
-+      "name": "virtio-blk-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "authz-list",
-+      "parent": "authz"
-+    },
-+    {
-+      "name": "z9EC.2-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "s390-pv-guest",
-+      "parent": "confidential-guest-support"
-+    },
-+    {
-+      "name": "vhost-user-snd",
-+      "parent": "vhost-user-base"
-+    },
-+    {
-+      "name": "vhost-user-fs-pci",
-+      "parent": "vhost-user-fs-pci-base"
-+    },
-+    {
-+      "name": "vfio-ccw",
-+      "parent": "s390-ccw"
-+    },
-+    {
-+      "name": "vhost-user-scsi-pci-transitional",
-+      "parent": "vhost-user-scsi-pci-base"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-6.0-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "chardev-pipe",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "z900.3-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "z13.2-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "pci-bridge-seat",
-+      "parent": "pci-bridge"
-+    },
-+    {
-+      "name": "z990.3-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "qio-channel-block",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "sclpquiesce",
-+      "parent": "s390-sclp-event-type"
-+    },
-+    {
-+      "name": "virtio-ccw-bus",
-+      "parent": "virtio-bus"
-+    },
-+    {
-+      "name": "s390-pcihost",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "s390-flic-kvm",
-+      "parent": "s390-flic"
-+    },
-+    {
-+      "name": "chardev-mux",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "scsi-block",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "s390-ccw-virtio-8.0-machine",
-+      "parent": "s390-ccw-machine"
-+    },
-+    {
-+      "name": "vhost-vdpa-device-pci",
-+      "parent": "vhost-vdpa-device-pci-base"
-+    },
-+    {
-+      "name": "legacy-reset",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "z13s-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "SCSI",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "ivshmem-flat",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "rng-builtin",
-+      "parent": "rng-backend"
-+    },
-+    {
-+      "name": "filter-dump",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "virtio-pci-bus",
-+      "parent": "virtio-bus"
-+    },
-+    {
-+      "name": "zBC12-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "chardev-ringbuf",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-rng-ccw",
-+      "parent": "virtio-ccw-device"
-+    },
-+    {
-+      "name": "nvme-subsys",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "vhost-user-blk",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "s390-pcibus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "z990-base-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "z9BC.2-s390x-cpu",
-+      "parent": "s390x-cpu"
-+    },
-+    {
-+      "name": "qio-channel-tls",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "authz-pam",
-+      "parent": "authz"
-+    }
-+  ],
-+  "id": "libvirt-6"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-blk-pci"
-+  },
-+  "id": "libvirt-7"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lcyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "queue-size",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lheads",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-invalid",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lsecs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "secs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 65535,
-+      "name": "num-queues",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "cyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "min_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-blk-device>"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "heads",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "config-wce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "seg-max-adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "iothread-vq-mapping",
-+      "description": "IOThread virtqueue mapping list [{\"iothread\":\"<id>\", \"vqs\":[1,2,3,...]},...]",
-+      "type": "IOThreadVirtQueueMappingList"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "report-discard-granularity",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "opt_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 4194303,
-+      "name": "max-discard-sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "discard",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "discard_granularity",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "request-merging",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "write-zeroes",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4194303,
-+      "name": "max-write-zeroes-sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-failed",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "backend_defaults",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-enable-wce-if-config-wce",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-7"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-net-pci"
-+  },
-+  "id": "libvirt-8"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mac",
-+      "description": "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "gso",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 150000,
-+      "name": "x-txtimer",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "mq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "mrg_rxbuf",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "host_mtu",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "x-txburst",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "tx",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "rss",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_uso",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "status",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "failover",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-net-device>"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_mac_addr",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "tx_queue_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hash",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_guest_offloads",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_uso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": [],
-+      "name": "ebpf-rss-fds",
-+      "type": "list"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "guest_rsc_ext",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "duplex",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 300000,
-+      "name": "rsc_interval",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_announce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "netdev",
-+      "description": "ID of a netdev to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-mtu-bypass-backend",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_rx_extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "rx_queue_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_uso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_vlan",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "speed",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_rx",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-8"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-scsi-pci"
-+  },
-+  "id": "libvirt-9"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "hotplug",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "num_queues",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 65535,
-+      "name": "max_sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "param_change",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "virtqueue_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "seg_max_adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 128,
-+      "name": "cmd_per_lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-scsi-device>"
-+    }
-+  ],
-+  "id": "libvirt-9"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-blk-ccw"
-+  },
-+  "id": "libvirt-10"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "dev_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "devno",
-+      "description": "Identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "subch_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "loadparm",
-+      "description": "Up to 8 chars in set of [A-Za-z0-9. ] to pass to the guest loader/kernel",
-+      "type": "ccw_loadparm"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "max_revision",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lcyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "queue-size",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lheads",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-invalid",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lsecs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "secs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 65535,
-+      "name": "num-queues",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "cyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "min_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-blk-device>"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "heads",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "config-wce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "seg-max-adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "iothread-vq-mapping",
-+      "description": "IOThread virtqueue mapping list [{\"iothread\":\"<id>\", \"vqs\":[1,2,3,...]},...]",
-+      "type": "IOThreadVirtQueueMappingList"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "report-discard-granularity",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "opt_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 4194303,
-+      "name": "max-discard-sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "discard",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "discard_granularity",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "request-merging",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "write-zeroes",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4194303,
-+      "name": "max-write-zeroes-sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-failed",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "backend_defaults",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-enable-wce-if-config-wce",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-10"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-net-ccw"
-+  },
-+  "id": "libvirt-11"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "dev_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "devno",
-+      "description": "Identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "subch_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "loadparm",
-+      "description": "Up to 8 chars in set of [A-Za-z0-9. ] to pass to the guest loader/kernel",
-+      "type": "ccw_loadparm"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "max_revision",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mac",
-+      "description": "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "gso",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 150000,
-+      "name": "x-txtimer",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "mq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "mrg_rxbuf",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "host_mtu",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "x-txburst",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "tx",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "rss",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_uso",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "status",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "failover",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-net-device>"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_mac_addr",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "tx_queue_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "hash",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_guest_offloads",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_uso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": [],
-+      "name": "ebpf-rss-fds",
-+      "type": "list"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "guest_rsc_ext",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "duplex",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 300000,
-+      "name": "rsc_interval",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_announce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "netdev",
-+      "description": "ID of a netdev to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "host_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-mtu-bypass-backend",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_rx_extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "rx_queue_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_uso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_vlan",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "speed",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ctrl_rx",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-11"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-scsi-ccw"
-+  },
-+  "id": "libvirt-12"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "dev_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "devno",
-+      "description": "Identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "subch_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "max_revision",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "hotplug",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "num_queues",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 65535,
-+      "name": "max_sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "param_change",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "virtqueue_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "seg_max_adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 128,
-+      "name": "cmd_per_lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-scsi-device>"
-+    }
-+  ],
-+  "id": "libvirt-12"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "vfio-pci"
-+  },
-+  "id": "libvirt-13"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "on",
-+      "name": "x-pre-copy-dirty-page-tracking",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-kvm-intx",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "migration-events",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "on",
-+      "name": "x-device-dirty-page-tracking",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "x-pci-sub-device-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "fd",
-+      "type": "string"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "enable-migration",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "skip-vsc-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "x-pci-device-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-kvm-msi",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "off",
-+      "name": "display",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "x-pci-sub-vendor-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-mmap",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "off",
-+      "name": "x-msix-relocation",
-+      "description": "off/auto/bar0/bar1/bar2/bar3/bar4/bar5",
-+      "type": "OffAutoPCIBAR"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-req",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-kvm-ioeventfd",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "x-pci-vendor-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-vfio-ioeventfd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-nv-gpudirect-clique",
-+      "description": "NVIDIA GPUDirect Clique ID (0 - 15)",
-+      "type": "uint4"
-+    },
-+    {
-+      "default-value": 1100,
-+      "name": "x-intx-mmap-timeout-ms",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "x-igd-gms",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "sysfsdev",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vf-token",
-+      "description": "UUID (aka GUID) or \"auto\" for random value (default)",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-vga",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-igd-opregion",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-kvm-msix",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommufd",
-+      "type": "link<iommufd>"
-+    },
-+    {
-+      "name": "host",
-+      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-no-geforce-quirks",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-balloon-allowed",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-13"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "scsi-hd"
-+  },
-+  "id": "libvirt-14"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": 4294967295,
-+      "name": "scsi-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "channel",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "secs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lcyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-invalid",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lsecs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 5,
-+      "name": "scsi_version",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "removable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ver",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 1073741824,
-+      "name": "max_unmap_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "cyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "min_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "product",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "rotation_rate",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "heads",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "dpofua",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "vendor",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 2147483647,
-+      "name": "max_io_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "quirk_mode_page_vendor_specific_apple",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "opt_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "name": "loadparm",
-+      "description": "load parameter (s390x only)",
-+      "type": "string"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-emulated-scsi-request",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "discard_granularity",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "port_wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "port_index",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-failed",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lheads",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "device_id",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "backend_defaults",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-14"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "ide-hd"
-+  },
-+  "id": "libvirt-15"
-+}
-+
-+{
-+  "id": "libvirt-15",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'ide-hd' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "PIIX4_PM"
-+  },
-+  "id": "libvirt-16"
-+}
-+
-+{
-+  "id": "libvirt-16",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'PIIX4_PM' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "usb-redir"
-+  },
-+  "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"
-+    },
-+    {
-+      "name": "filter",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "streams",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "chardev",
-+      "description": "ID of a chardev to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "debug",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "suppress-remote-wake",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    }
-+  ],
-+  "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-19",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'kvm-pit' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-gpu-pci"
-+  },
-+  "id": "libvirt-20"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 3,
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 800,
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "edid",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "x-scanout-vmstate-version",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 268435456,
-+      "name": "max_hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "blob",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 1,
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 1280,
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-gpu-device>"
-+    }
-+  ],
-+  "id": "libvirt-20"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-gpu-device"
-+  },
-+  "id": "libvirt-21"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 1,
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 1280,
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "x-scanout-vmstate-version",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": 800,
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 268435456,
-+      "name": "max_hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "edid",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "blob",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hostmem",
-+      "type": "size"
-+    }
-+  ],
-+  "id": "libvirt-21"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "ICH9-LPC"
-+  },
-+  "id": "libvirt-22"
-+}
-+
-+{
-+  "id": "libvirt-22",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'ICH9-LPC' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-pci"
-+  },
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "free-page-reporting",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "deflate-on-oom",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "page-poison",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats",
-+      "type": "guest statistics"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "qemu-4-0-config-size",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "free-page-hint",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-balloon-device>"
-+    }
-+  ],
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-ccw"
-+  },
-+  "id": "libvirt-24"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "dev_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "devno",
-+      "description": "Identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "subch_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "max_revision",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "free-page-reporting",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "deflate-on-oom",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "page-poison",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats",
-+      "type": "guest statistics"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "qemu-4-0-config-size",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "free-page-hint",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-balloon-device>"
-+    }
-+  ],
-+  "id": "libvirt-24"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-device"
-+  },
-+  "id": "libvirt-25"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "deflate-on-oom",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "free-page-hint",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "page-poison",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "qemu-4-0-config-size",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "free-page-reporting",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
-+    },
-+    {
-+      "name": "guest-stats",
-+      "type": "guest statistics"
-+    }
-+  ],
-+  "id": "libvirt-25"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-gpu-ccw"
-+  },
-+  "id": "libvirt-26"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "dev_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "devno",
-+      "description": "Identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "subch_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "max_revision",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 800,
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "edid",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "x-scanout-vmstate-version",
-+      "type": "uint8"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 268435456,
-+      "name": "max_hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "blob",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 1,
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 1280,
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-gpu-device>"
-+    }
-+  ],
-+  "id": "libvirt-26"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "usb-host"
-+  },
-+  "id": "libvirt-27"
-+}
-+
-+{
-+  "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": true,
-+      "name": "pipeline",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hostbus",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 4,
-+      "name": "isobufs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "vendorid",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "productid",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hostport",
-+      "type": "str"
-+    },
-+    {
-+      "name": "hostdevice",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "hostaddr",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "suppress-remote-wake",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "loglevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 32,
-+      "name": "isobsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "guest-resets-all",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "guest-reset",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-27"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "vhost-user-fs-device"
-+  },
-+  "id": "libvirt-28"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "chardev",
-+      "description": "ID of a chardev to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 128,
-+      "name": "queue-size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "tag",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 1,
-+      "name": "num-request-queues",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-28"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-mem-pci"
-+  },
-+  "id": "libvirt-29"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "memaddr",
-+      "type": "uint64"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "memdev",
-+      "type": "link<memory-backend>"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-early-migration",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "node",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "requested-size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "block-size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "prealloc",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "dynamic-memslots",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-mem>"
-+    }
-+  ],
-+  "id": "libvirt-29"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-iommu-pci"
-+  },
-+  "id": "libvirt-30"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "failover_pair_id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-ext-tag",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "romsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": -1,
-+      "name": "rombar",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": 4096,
-+      "name": "x-max-bounce-buffer-size",
-+      "description": "Maximum buffer size allocated for bounce buffers used for mapped access to indirect DMA memory",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-ari-nextfn-1",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-err-unc-mask",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "busnr",
-+      "type": "busnr"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "acpi-index",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "aer",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-pcie-pm-no-soft-reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-flr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-ats-page-aligned",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": [],
-+      "name": "reserved-regions",
-+      "type": "list"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "host",
-+      "name": "granule",
-+      "description": "granule_mode values, 4k, 8k, 16k, 64k, host",
-+      "type": "GranuleMode"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "boot-bypass",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "primary-bus",
-+      "type": "link<PCI>"
-+    },
-+    {
-+      "default-value": 64,
-+      "name": "aw-bits",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-iommu-device>"
-+    }
-+  ],
-+  "id": "libvirt-30"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-blk-ccw"
-+  },
-+  "id": "libvirt-31"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "dev_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "devno",
-+      "description": "Identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "subch_id",
-+      "description": "Read-only identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
-+      "type": "str"
-+    },
-+    {
-+      "name": "loadparm",
-+      "description": "Up to 8 chars in set of [A-Za-z0-9. ] to pass to the guest loader/kernel",
-+      "type": "ccw_loadparm"
-+    },
-+    {
-+      "default-value": 2,
-+      "name": "max_revision",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lcyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 256,
-+      "name": "queue-size",
-+      "type": "uint16"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lheads",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-invalid",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "lsecs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "secs",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 65535,
-+      "name": "num-queues",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "cyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "min_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "in_order",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-blk-device>"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "heads",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "config-wce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "seg-max-adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "iothread-vq-mapping",
-+      "description": "IOThread virtqueue mapping list [{\"iothread\":\"<id>\", \"vqs\":[1,2,3,...]},...]",
-+      "type": "IOThreadVirtQueueMappingList"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "report-discard-granularity",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-disabled-flag",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "use-started",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "x-disable-legacy-check",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "opt_io_size",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 0,
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 B and 2 MiB",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": 4194303,
-+      "name": "max-discard-sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "discard",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4294967295,
-+      "name": "discard_granularity",
-+      "type": "size"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "request-merging",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "queue_reset",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "write-zeroes",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": 4194303,
-+      "name": "max-write-zeroes-sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "default-value": false,
-+      "name": "packed",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "account-failed",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "default-value": "auto",
-+      "name": "backend_defaults",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "default-value": true,
-+      "name": "x-enable-wce-if-config-wce",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-31"
-+}
-+
-+{
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "memory-backend-file"
-+  },
-+  "id": "libvirt-32"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "type",
-+      "type": "string"
-+    },
-+    {
-+      "name": "share",
-+      "description": "Mark the memory as private to QEMU or shared",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "size",
-+      "description": "Size of the memory region (ex: 500M)",
-+      "type": "int"
-+    },
-+    {
-+      "name": "dump",
-+      "description": "Set to 'off' to exclude from core dump",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "prealloc-threads",
-+      "description": "Number of CPU threads to use for prealloc",
-+      "type": "int"
-+    },
-+    {
-+      "name": "x-use-canonical-path-for-ramblock-id",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "policy",
-+      "description": "Set the NUMA policy",
-+      "type": "HostMemPolicy"
-+    },
-+    {
-+      "name": "prealloc-context",
-+      "description": "Context to use for creating CPU threads for preallocation",
-+      "type": "link<thread-context>"
-+    },
-+    {
-+      "name": "prealloc",
-+      "description": "Preallocate memory",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "reserve",
-+      "description": "Reserve swap space (or huge pages) if applicable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-nodes",
-+      "description": "Binds memory to the list of NUMA host nodes",
-+      "type": "int"
-+    },
-+    {
-+      "name": "merge",
-+      "description": "Mark memory as mergeable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "readonly",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "align",
-+      "type": "int"
-+    },
-+    {
-+      "name": "offset",
-+      "description": "Offset into the target file (ex: 1G)",
-+      "type": "int"
-+    },
-+    {
-+      "name": "mem-path",
-+      "type": "string"
-+    },
-+    {
-+      "name": "rom",
-+      "description": "Whether to create Read Only Memory (ROM)",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "discard-data",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-32"
-+}
-+
-+{
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "memory-backend-memfd"
-+  },
-+  "id": "libvirt-33"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "type",
-+      "type": "string"
-+    },
-+    {
-+      "name": "share",
-+      "description": "Mark the memory as private to QEMU or shared",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "size",
-+      "description": "Size of the memory region (ex: 500M)",
-+      "type": "int"
-+    },
-+    {
-+      "name": "dump",
-+      "description": "Set to 'off' to exclude from core dump",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "prealloc-threads",
-+      "description": "Number of CPU threads to use for prealloc",
-+      "type": "int"
-+    },
-+    {
-+      "name": "x-use-canonical-path-for-ramblock-id",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "policy",
-+      "description": "Set the NUMA policy",
-+      "type": "HostMemPolicy"
-+    },
-+    {
-+      "name": "prealloc-context",
-+      "description": "Context to use for creating CPU threads for preallocation",
-+      "type": "link<thread-context>"
-+    },
-+    {
-+      "name": "prealloc",
-+      "description": "Preallocate memory",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "reserve",
-+      "description": "Reserve swap space (or huge pages) if applicable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-nodes",
-+      "description": "Binds memory to the list of NUMA host nodes",
-+      "type": "int"
-+    },
-+    {
-+      "name": "merge",
-+      "description": "Mark memory as mergeable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hugetlb",
-+      "description": "Use huge pages",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "seal",
-+      "description": "Seal growing & shrinking",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hugetlbsize",
-+      "description": "Huge pages size (ex: 2M, 1G)",
-+      "type": "int"
-+    }
-+  ],
-+  "id": "libvirt-33"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-34"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-8.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-6.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-2.11",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-7.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-5.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-9.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-4.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-8.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "none",
-+      "numa-mem-supported": false,
-+      "acpi": false,
-+      "cpu-max": 1,
-+      "deprecated": false,
-+      "default-ram-id": "ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-6.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-3.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-7.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "x-remote",
-+      "numa-mem-supported": false,
-+      "acpi": false,
-+      "cpu-max": 1,
-+      "deprecated": false
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-5.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-4.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-2.10",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-9.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-10.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "is-default": true,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram",
-+      "alias": "s390-ccw-virtio"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-8.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-6.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-2.12",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-7.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-5.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-2.9",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-4.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-3.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-9.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "host-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    }
-+  ],
-+  "id": "libvirt-34"
-+}
-+
-+{
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "none-machine"
-+  },
-+  "id": "libvirt-35"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "type",
-+      "type": "string"
-+    },
-+    {
-+      "name": "kernel",
-+      "description": "Linux kernel image file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "dt-compatible",
-+      "description": "Overrides the \"compatible\" property of the dt root node",
-+      "type": "string"
-+    },
-+    {
-+      "name": "boot",
-+      "description": "Boot configuration",
-+      "type": "BootConfiguration"
-+    },
-+    {
-+      "name": "memory",
-+      "description": "Memory size configuration",
-+      "type": "MemorySizeConfiguration"
-+    },
-+    {
-+      "name": "initrd",
-+      "description": "Linux initial ramdisk file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "confidential-guest-support",
-+      "description": "Set confidential guest scheme to support",
-+      "type": "link<confidential-guest-support>"
-+    },
-+    {
-+      "name": "graphics",
-+      "description": "Set on/off to enable/disable graphics emulation",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "usb",
-+      "description": "Set on/off to enable/disable usb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "firmware",
-+      "description": "Firmware image",
-+      "type": "string"
-+    },
-+    {
-+      "name": "memory-encryption",
-+      "description": "Set memory encryption object to use",
-+      "type": "string"
-+    },
-+    {
-+      "name": "dump-guest-core",
-+      "description": "Include guest memory in a core dump",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smp",
-+      "description": "CPU topology",
-+      "type": "SMPConfiguration"
-+    },
-+    {
-+      "name": "shim",
-+      "description": "shim.efi file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "smp-cache",
-+      "description": "Cache properties list for SMP machine",
-+      "type": "SmpCachePropertiesWrapper"
-+    },
-+    {
-+      "name": "dumpdtb",
-+      "description": "Dump current dtb to a file and quit",
-+      "type": "string"
-+    },
-+    {
-+      "name": "phandle-start",
-+      "description": "The first phandle ID we may generate dynamically",
-+      "type": "int"
-+    },
-+    {
-+      "name": "memory-backend",
-+      "description": "Set RAM backendValid value is ID of hostmem based backend",
-+      "type": "link<memory-backend>"
-+    },
-+    {
-+      "name": "mem-merge",
-+      "description": "Enable/disable memory merge support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dtb",
-+      "description": "Linux kernel device tree file",
-+      "type": "string"
-+    },
-+    {
-+      "name": "append",
-+      "description": "Linux kernel command line",
-+      "type": "string"
-+    },
-+    {
-+      "name": "suppress-vmdesc",
-+      "description": "Set on to disable self-describing migration",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-35"
-+}
-+
-+{
-+  "execute": "query-cpu-definitions",
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "z13",
-+      "typename": "z13-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.3",
-+      "typename": "z990.3-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z13-base",
-+      "typename": "z13-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.2",
-+      "typename": "z990.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z196.2-base",
-+      "typename": "z196.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14",
-+      "typename": "z14-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14.2-base",
-+      "typename": "z14.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.4",
-+      "typename": "z990.4-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z196",
-+      "typename": "z196-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10BC.2-base",
-+      "typename": "z10BC.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z114-base",
-+      "typename": "z114-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen16b",
-+      "typename": "gen16b-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890.3-base",
-+      "typename": "z890.3-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen16a",
-+      "typename": "gen16a-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.5",
-+      "typename": "z990.5-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z196.2",
-+      "typename": "z196.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC.2",
-+      "typename": "z9EC.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zEC12",
-+      "typename": "zEC12-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zEC12.2",
-+      "typename": "zEC12.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9BC",
-+      "typename": "z9BC-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC.3-base",
-+      "typename": "z9EC.3-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z800-base",
-+      "typename": "z800-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14ZR1-base",
-+      "typename": "z14ZR1-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890",
-+      "typename": "z890-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen17a-base",
-+      "typename": "gen17a-base-s390x-cpu",
-+      "unavailable-features": [
-+        "sif",
-+        "minste4",
-+        "msa12",
-+        "plo_ext",
-+        "type"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.4-base",
-+      "typename": "z990.4-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC.3",
-+      "typename": "z9EC.3-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z13.2",
-+      "typename": "z13.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10BC.2",
-+      "typename": "z10BC.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen15a-base",
-+      "typename": "gen15a-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14.2",
-+      "typename": "z14.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zBC12-base",
-+      "typename": "zBC12-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen16a-base",
-+      "typename": "gen16a-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900.3",
-+      "typename": "z900.3-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z196-base",
-+      "typename": "z196-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990",
-+      "typename": "z990-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14-base",
-+      "typename": "z14-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900.2",
-+      "typename": "z900.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z800",
-+      "typename": "z800-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC",
-+      "typename": "z10EC-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14ZR1",
-+      "typename": "z14ZR1-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900",
-+      "typename": "z900-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC.2-base",
-+      "typename": "z10EC.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC.2",
-+      "typename": "z10EC.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900.2-base",
-+      "typename": "z900.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900-base",
-+      "typename": "z900-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC.3",
-+      "typename": "z10EC.3-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.5-base",
-+      "typename": "z990.5-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "max",
-+      "typename": "max-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen15b",
-+      "typename": "gen15b-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9BC.2-base",
-+      "typename": "z9BC.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen15a",
-+      "typename": "gen15a-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.2-base",
-+      "typename": "z990.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC-base",
-+      "typename": "z10EC-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen16b-base",
-+      "typename": "gen16b-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z114",
-+      "typename": "z114-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen17b-base",
-+      "typename": "gen17b-base-s390x-cpu",
-+      "unavailable-features": [
-+        "sif",
-+        "minste4",
-+        "msa12",
-+        "plo_ext",
-+        "type"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC-base",
-+      "typename": "z9EC-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z13s",
-+      "typename": "z13s-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen17a",
-+      "typename": "gen17a-s390x-cpu",
-+      "unavailable-features": [
-+        "vxpdeh3",
-+        "vxeh3",
-+        "sif",
-+        "minste4",
-+        "msa13_pckmo",
-+        "msa13",
-+        "msa12",
-+        "msa11_pckmo",
-+        "msa11",
-+        "msa10_pckmo",
-+        "msa10",
-+        "plo_ext",
-+        "type"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "qemu",
-+      "typename": "qemu-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen15b-base",
-+      "typename": "gen15b-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zEC12-base",
-+      "typename": "zEC12-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890.3",
-+      "typename": "z890.3-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC.3-base",
-+      "typename": "z10EC.3-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890.2-base",
-+      "typename": "z890.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890.2",
-+      "typename": "z890.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen17b",
-+      "typename": "gen17b-s390x-cpu",
-+      "unavailable-features": [
-+        "vxpdeh3",
-+        "vxeh3",
-+        "sif",
-+        "minste4",
-+        "msa13_pckmo",
-+        "msa13",
-+        "msa12",
-+        "msa11_pckmo",
-+        "msa11",
-+        "msa10_pckmo",
-+        "msa10",
-+        "plo_ext",
-+        "type"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10BC-base",
-+      "typename": "z10BC-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zEC12.2-base",
-+      "typename": "zEC12.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890-base",
-+      "typename": "z890-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9BC-base",
-+      "typename": "z9BC-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10BC",
-+      "typename": "z10BC-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC",
-+      "typename": "z9EC-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC.2-base",
-+      "typename": "z9EC.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900.3-base",
-+      "typename": "z900.3-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z13.2-base",
-+      "typename": "z13.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.3-base",
-+      "typename": "z990.3-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z13s-base",
-+      "typename": "z13s-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zBC12",
-+      "typename": "zBC12-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990-base",
-+      "typename": "z990-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9BC.2",
-+      "typename": "z9BC.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    }
-+  ],
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "execute": "query-tpm-models",
-+  "id": "libvirt-37"
-+}
-+
-+{
-+  "return": [],
-+  "id": "libvirt-37"
-+}
-+
-+{
-+  "execute": "query-tpm-types",
-+  "id": "libvirt-38"
-+}
-+
-+{
-+  "return": [],
-+  "id": "libvirt-38"
-+}
-+
-+{
-+  "execute": "query-command-line-options",
-+  "id": "libvirt-39"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "parameters": [
-+        {
-+          "name": "type",
-+          "help": "machine type",
-+          "type": "string"
-+        },
-+        {
-+          "name": "auto-shutdown",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "vfio-user",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "kernel",
-+          "help": "Linux kernel image file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "dt-compatible",
-+          "help": "Overrides the \"compatible\" property of the dt root node",
-+          "type": "string"
-+        },
-+        {
-+          "name": "boot",
-+          "help": "Boot configuration",
-+          "type": "string"
-+        },
-+        {
-+          "name": "memory",
-+          "help": "Memory size configuration",
-+          "type": "string"
-+        },
-+        {
-+          "name": "initrd",
-+          "help": "Linux initial ramdisk file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "confidential-guest-support",
-+          "help": "Set confidential guest scheme to support",
-+          "type": "string"
-+        },
-+        {
-+          "name": "graphics",
-+          "help": "Set on/off to enable/disable graphics emulation",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "usb",
-+          "help": "Set on/off to enable/disable usb",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "firmware",
-+          "help": "Firmware image",
-+          "type": "string"
-+        },
-+        {
-+          "name": "memory-encryption",
-+          "help": "Set memory encryption object to use",
-+          "type": "string"
-+        },
-+        {
-+          "name": "dump-guest-core",
-+          "help": "Include guest memory in a core dump",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "smp",
-+          "help": "CPU topology",
-+          "type": "string"
-+        },
-+        {
-+          "name": "shim",
-+          "help": "shim.efi file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "smp-cache",
-+          "help": "Cache properties list for SMP machine",
-+          "type": "string"
-+        },
-+        {
-+          "name": "dumpdtb",
-+          "help": "Dump current dtb to a file and quit",
-+          "type": "string"
-+        },
-+        {
-+          "name": "phandle-start",
-+          "help": "The first phandle ID we may generate dynamically",
-+          "type": "number"
-+        },
-+        {
-+          "name": "memory-backend",
-+          "help": "Set RAM backendValid value is ID of hostmem based backend",
-+          "type": "string"
-+        },
-+        {
-+          "name": "mem-merge",
-+          "help": "Enable/disable memory merge support",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "dtb",
-+          "help": "Linux kernel device tree file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "append",
-+          "help": "Linux kernel command line",
-+          "type": "string"
-+        },
-+        {
-+          "name": "suppress-vmdesc",
-+          "help": "Set on to disable self-describing migration",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "loadparm",
-+          "help": "Up to 8 chars in set of [A-Za-z0-9. ] (lower case chars converted to upper case) to pass to machine loader, boot manager, and guest kernel",
-+          "type": "string"
-+        },
-+        {
-+          "name": "aes-key-wrap",
-+          "help": "enable/disable AES key wrapping using the CPACF wrapping key",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "dea-key-wrap",
-+          "help": "enable/disable DEA key wrapping using the CPACF wrapping key",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "machine"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "timeout",
-+          "help": "Request timeout in seconds (default 0 = no timeout)",
-+          "type": "number"
-+        },
-+        {
-+          "name": "initiator-name",
-+          "help": "Initiator iqn name to use when connecting",
-+          "type": "string"
-+        },
-+        {
-+          "name": "header-digest",
-+          "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}",
-+          "type": "string"
-+        },
-+        {
-+          "name": "password-secret",
-+          "help": "ID of the secret providing password for CHAP authentication to target",
-+          "type": "string"
-+        },
-+        {
-+          "name": "password",
-+          "help": "password for CHAP authentication to target",
-+          "type": "string"
-+        },
-+        {
-+          "name": "user",
-+          "help": "username for CHAP authentication to target",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "iscsi"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "resourcecontrol",
-+          "type": "string"
-+        },
-+        {
-+          "name": "spawn",
-+          "type": "string"
-+        },
-+        {
-+          "name": "elevateprivileges",
-+          "type": "string"
-+        },
-+        {
-+          "name": "obsolete",
-+          "type": "string"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "sandbox"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "dmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "fmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "sock_fd",
-+          "type": "number"
-+        },
-+        {
-+          "name": "socket",
-+          "type": "string"
-+        },
-+        {
-+          "name": "multidevs",
-+          "type": "string"
-+        },
-+        {
-+          "name": "readonly",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "writeout",
-+          "type": "string"
-+        },
-+        {
-+          "name": "security_model",
-+          "type": "string"
-+        },
-+        {
-+          "name": "mount_tag",
-+          "type": "string"
-+        },
-+        {
-+          "name": "path",
-+          "type": "string"
-+        },
-+        {
-+          "name": "fsdriver",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "virtfs"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "throttling.iops-size",
-+          "help": "when limiting by iops max size of an I/O in bytes",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write-max-length",
-+          "help": "length of the bps-write-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read-max-length",
-+          "help": "length of the bps-read-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total-max-length",
-+          "help": "length of the bps-total-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write-max-length",
-+          "help": "length of the iops-write-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read-max-length",
-+          "help": "length of the iops-read-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total-max-length",
-+          "help": "length of the iops-total-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write-max",
-+          "help": "total bytes write burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read-max",
-+          "help": "total bytes read burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total-max",
-+          "help": "total bytes burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write-max",
-+          "help": "I/O operations write burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read-max",
-+          "help": "I/O operations read burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total-max",
-+          "help": "I/O operations burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write",
-+          "help": "limit write bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read",
-+          "help": "limit read bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total",
-+          "help": "limit total bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write",
-+          "help": "limit write operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read",
-+          "help": "limit read operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total",
-+          "help": "limit total I/O operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "dmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "fmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "sock_fd",
-+          "type": "number"
-+        },
-+        {
-+          "name": "socket",
-+          "type": "string"
-+        },
-+        {
-+          "name": "multidevs",
-+          "type": "string"
-+        },
-+        {
-+          "name": "readonly",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "writeout",
-+          "type": "string"
-+        },
-+        {
-+          "name": "security_model",
-+          "type": "string"
-+        },
-+        {
-+          "name": "path",
-+          "type": "string"
-+        },
-+        {
-+          "name": "fsdriver",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "fsdev"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "power-control",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "audiodev",
-+          "type": "string"
-+        },
-+        {
-+          "name": "non-adaptive",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "lossy",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "sasl-authz",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "type": "string"
-+        },
-+        {
-+          "name": "sasl",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "key-delay-ms",
-+          "type": "number"
-+        },
-+        {
-+          "name": "lock-key-sync",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "reverse",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "password-secret",
-+          "type": "string"
-+        },
-+        {
-+          "name": "password",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "ipv6",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "ipv4",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "to",
-+          "type": "number"
-+        },
-+        {
-+          "name": "connections",
-+          "type": "number"
-+        },
-+        {
-+          "name": "head",
-+          "type": "number"
-+        },
-+        {
-+          "name": "display",
-+          "type": "string"
-+        },
-+        {
-+          "name": "share",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "type": "string"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "string"
-+        },
-+        {
-+          "name": "vnc",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "vnc"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "user",
-+          "type": "string"
-+        },
-+        {
-+          "name": "chroot",
-+          "type": "string"
-+        },
-+        {
-+          "name": "async-teardown",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "run-with"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "watchdog",
-+          "type": "string"
-+        },
-+        {
-+          "name": "panic",
-+          "type": "string"
-+        },
-+        {
-+          "name": "reboot",
-+          "type": "string"
-+        },
-+        {
-+          "name": "shutdown",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "action"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "gen_id",
-+          "help": "Sets id of the object generating the fw_cfg blob to be inserted",
-+          "type": "string"
-+        },
-+        {
-+          "name": "string",
-+          "help": "Sets content of the blob to be inserted from a string",
-+          "type": "string"
-+        },
-+        {
-+          "name": "file",
-+          "help": "Sets the name of the file from which the fw_cfg blob will be loaded",
-+          "type": "string"
-+        },
-+        {
-+          "name": "name",
-+          "help": "Sets the fw_cfg name of the blob to be inserted",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "fw_cfg"
-+    },
-+    {
-+      "parameters": [],
-+      "option": ""
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "rrsnapshot",
-+          "type": "string"
-+        },
-+        {
-+          "name": "rrfile",
-+          "type": "string"
-+        },
-+        {
-+          "name": "rr",
-+          "type": "string"
-+        },
-+        {
-+          "name": "sleep",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "align",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "shift",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "icount"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "numa"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "debug-threads",
-+          "help": "When enabled, name the individual threads; defaults off.\nNOTE: The thread names are for debugging and not a\nstable API.",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "process",
-+          "help": "Sets the name of the QEMU process, as shown in top etc",
-+          "type": "string"
-+        },
-+        {
-+          "name": "guest",
-+          "help": "Sets the name of the guest.\nThis name will be displayed in the SDL window caption.\nThe name will also be used for the VNC server",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "name"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "guest-name",
-+          "help": "Prepends guest name for error messages but only if -name guest is set otherwise option is ignored\n",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "timestamp",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "msg"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "cpu-pm",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "mem-lock",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "overcommit"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "tpmdev"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "object"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "opaque",
-+          "help": "free-form string used to describe fd",
-+          "type": "string"
-+        },
-+        {
-+          "name": "set",
-+          "help": "ID of the fd set to add fd to",
-+          "type": "number"
-+        },
-+        {
-+          "name": "fd",
-+          "help": "file descriptor of which a duplicate is added to fd set",
-+          "type": "number"
-+        }
-+      ],
-+      "option": "add-fd"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "strict",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "reboot-timeout",
-+          "type": "number"
-+        },
-+        {
-+          "name": "splash-time",
-+          "type": "number"
-+        },
-+        {
-+          "name": "splash",
-+          "type": "string"
-+        },
-+        {
-+          "name": "menu",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "once",
-+          "type": "string"
-+        },
-+        {
-+          "name": "order",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "boot-opts"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "maxcpus",
-+          "type": "number"
-+        },
-+        {
-+          "name": "threads",
-+          "type": "number"
-+        },
-+        {
-+          "name": "cores",
-+          "type": "number"
-+        },
-+        {
-+          "name": "modules",
-+          "type": "number"
-+        },
-+        {
-+          "name": "clusters",
-+          "type": "number"
-+        },
-+        {
-+          "name": "dies",
-+          "type": "number"
-+        },
-+        {
-+          "name": "sockets",
-+          "type": "number"
-+        },
-+        {
-+          "name": "books",
-+          "type": "number"
-+        },
-+        {
-+          "name": "drawers",
-+          "type": "number"
-+        },
-+        {
-+          "name": "cpus",
-+          "type": "number"
-+        }
-+      ],
-+      "option": "smp-opts"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "maxmem",
-+          "type": "size"
-+        },
-+        {
-+          "name": "slots",
-+          "type": "number"
-+        },
-+        {
-+          "name": "size",
-+          "type": "size"
-+        }
-+      ],
-+      "option": "memory"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "accel"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "romfile",
-+          "type": "string"
-+        },
-+        {
-+          "name": "bootindex",
-+          "type": "number"
-+        }
-+      ],
-+      "option": "option-rom"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "plugin"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "events",
-+          "type": "string"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "trace"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "pretty",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "string"
-+        },
-+        {
-+          "name": "mode",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "mon"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "value",
-+          "type": "string"
-+        },
-+        {
-+          "name": "property",
-+          "type": "string"
-+        },
-+        {
-+          "name": "driver",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "global"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "driftfix",
-+          "type": "string"
-+        },
-+        {
-+          "name": "clock",
-+          "type": "string"
-+        },
-+        {
-+          "name": "base",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "rtc"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "net"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "nic"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "netdev"
-+    },
-+    {
-+      "parameters": [],
-+      "option": "device"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "abstract",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "tight",
-+          "default": "on",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "clipboard",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "mouse",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "logappend",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "logfile",
-+          "type": "string"
-+        },
-+        {
-+          "name": "append",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "string"
-+        },
-+        {
-+          "name": "size",
-+          "type": "size"
-+        },
-+        {
-+          "name": "debug",
-+          "type": "number"
-+        },
-+        {
-+          "name": "name",
-+          "type": "string"
-+        },
-+        {
-+          "name": "signal",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "mux",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "rows",
-+          "type": "number"
-+        },
-+        {
-+          "name": "cols",
-+          "type": "number"
-+        },
-+        {
-+          "name": "height",
-+          "type": "number"
-+        },
-+        {
-+          "name": "width",
-+          "type": "number"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tn3270",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "telnet",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "reconnect-ms",
-+          "type": "number"
-+        },
-+        {
-+          "name": "reconnect",
-+          "type": "number"
-+        },
-+        {
-+          "name": "nodelay",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "delay",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "server",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "wait",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "ipv6",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "ipv4",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "to",
-+          "type": "number"
-+        },
-+        {
-+          "name": "localport",
-+          "type": "string"
-+        },
-+        {
-+          "name": "localaddr",
-+          "type": "string"
-+        },
-+        {
-+          "name": "fd",
-+          "type": "string"
-+        },
-+        {
-+          "name": "port",
-+          "type": "string"
-+        },
-+        {
-+          "name": "host",
-+          "type": "string"
-+        },
-+        {
-+          "name": "input-path",
-+          "type": "string"
-+        },
-+        {
-+          "name": "path",
-+          "type": "string"
-+        },
-+        {
-+          "name": "backend",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "chardev"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "copy-on-read",
-+          "help": "copy read data from backing file into image file",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "werror",
-+          "help": "write error action",
-+          "type": "string"
-+        },
-+        {
-+          "name": "rerror",
-+          "help": "read error action",
-+          "type": "string"
-+        },
-+        {
-+          "name": "read-only",
-+          "help": "open drive file as read-only",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "file",
-+          "help": "file name",
-+          "type": "string"
-+        },
-+        {
-+          "name": "if",
-+          "help": "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "media",
-+          "help": "media type (disk, cdrom)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "index",
-+          "help": "index number",
-+          "type": "number"
-+        },
-+        {
-+          "name": "unit",
-+          "help": "unit number (i.e. lun for scsi)",
-+          "type": "number"
-+        },
-+        {
-+          "name": "bus",
-+          "help": "bus number",
-+          "type": "number"
-+        },
-+        {
-+          "name": "stats-account-failed",
-+          "help": "whether to account for failed I/O operations in the statistics",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "stats-account-invalid",
-+          "help": "whether to account for invalid I/O operations in the statistics",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "detect-zeroes",
-+          "help": "try to optimize zero writes (off, on, unmap)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "throttling.group",
-+          "help": "name of the block throttling group",
-+          "type": "string"
-+        },
-+        {
-+          "name": "throttling.iops-size",
-+          "help": "when limiting by iops max size of an I/O in bytes",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write-max-length",
-+          "help": "length of the bps-write-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read-max-length",
-+          "help": "length of the bps-read-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total-max-length",
-+          "help": "length of the bps-total-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write-max-length",
-+          "help": "length of the iops-write-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read-max-length",
-+          "help": "length of the iops-read-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total-max-length",
-+          "help": "length of the iops-total-max burst period, in seconds",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write-max",
-+          "help": "total bytes write burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read-max",
-+          "help": "total bytes read burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total-max",
-+          "help": "total bytes burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write-max",
-+          "help": "I/O operations write burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read-max",
-+          "help": "I/O operations read burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total-max",
-+          "help": "I/O operations burst",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-write",
-+          "help": "limit write bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-read",
-+          "help": "limit read bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.bps-total",
-+          "help": "limit total bytes per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-write",
-+          "help": "limit write operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-read",
-+          "help": "limit read operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "throttling.iops-total",
-+          "help": "limit total I/O operations per second",
-+          "type": "number"
-+        },
-+        {
-+          "name": "werror",
-+          "help": "write error action",
-+          "type": "string"
-+        },
-+        {
-+          "name": "format",
-+          "help": "disk format (raw, qcow2, ...)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "cache.writeback",
-+          "help": "Enable writeback mode",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "aio",
-+          "help": "host AIO implementation (threads, native, io_uring)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "snapshot",
-+          "help": "enable/disable snapshot mode",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "force-share",
-+          "help": "always accept other writers (default: off)",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "discard",
-+          "help": "discard operation (ignore/off, unmap/on)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "auto-read-only",
-+          "help": "Node can become read-only if opening read-write fails",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "cache.no-flush",
-+          "help": "Ignore flush requests",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "cache.direct",
-+          "help": "Bypass software writeback cache on the host",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "driver",
-+          "help": "Block driver to use for the node",
-+          "type": "string"
-+        },
-+        {
-+          "name": "node-name",
-+          "help": "Node name of the block device node",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "drive"
-+    }
-+  ],
-+  "id": "libvirt-39"
-+}
-+
-+{
-+  "execute": "query-migrate-capabilities",
-+  "id": "libvirt-40"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "state": false,
-+      "capability": "xbzrle"
-+    },
-+    {
-+      "state": false,
-+      "capability": "rdma-pin-all"
-+    },
-+    {
-+      "state": false,
-+      "capability": "auto-converge"
-+    },
-+    {
-+      "state": false,
-+      "capability": "zero-blocks"
-+    },
-+    {
-+      "state": false,
-+      "capability": "events"
-+    },
-+    {
-+      "state": false,
-+      "capability": "postcopy-ram"
-+    },
-+    {
-+      "state": false,
-+      "capability": "x-colo"
-+    },
-+    {
-+      "state": false,
-+      "capability": "release-ram"
-+    },
-+    {
-+      "state": false,
-+      "capability": "return-path"
-+    },
-+    {
-+      "state": false,
-+      "capability": "pause-before-switchover"
-+    },
-+    {
-+      "state": false,
-+      "capability": "multifd"
-+    },
-+    {
-+      "state": false,
-+      "capability": "dirty-bitmaps"
-+    },
-+    {
-+      "state": false,
-+      "capability": "postcopy-blocktime"
-+    },
-+    {
-+      "state": false,
-+      "capability": "late-block-activate"
-+    },
-+    {
-+      "state": false,
-+      "capability": "x-ignore-shared"
-+    },
-+    {
-+      "state": false,
-+      "capability": "validate-uuid"
-+    },
-+    {
-+      "state": false,
-+      "capability": "background-snapshot"
-+    },
-+    {
-+      "state": false,
-+      "capability": "zero-copy-send"
-+    },
-+    {
-+      "state": false,
-+      "capability": "postcopy-preempt"
-+    },
-+    {
-+      "state": false,
-+      "capability": "switchover-ack"
-+    },
-+    {
-+      "state": false,
-+      "capability": "dirty-limit"
-+    },
-+    {
-+      "state": false,
-+      "capability": "mapped-ram"
-+    }
-+  ],
-+  "id": "libvirt-40"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "host"
-+    }
-+  },
-+  "id": "libvirt-41"
-+}
-+
-+{
-+  "return": {
-+    "deprecated-props": [
-+      "bpb",
-+      "te",
-+      "cte",
-+      "csske"
-+    ],
-+    "model": {
-+      "name": "gen16a-base",
-+      "props": {
-+        "nnpa": true,
-+        "aen": true,
-+        "cmmnt": true,
-+        "vxpdeh": true,
-+        "aefsi": true,
-+        "diag318": true,
-+        "csske": true,
-+        "mepoch": true,
-+        "msa9": true,
-+        "msa8": true,
-+        "msa7": true,
-+        "msa6": true,
-+        "msa5": true,
-+        "msa4": true,
-+        "msa3": true,
-+        "msa2": true,
-+        "msa1": true,
-+        "sthyi": true,
-+        "edat": true,
-+        "ri": true,
-+        "deflate": true,
-+        "edat2": true,
-+        "etoken": true,
-+        "vx": true,
-+        "ipter": true,
-+        "pai": true,
-+        "paie": true,
-+        "mepochptff": true,
-+        "ap": true,
-+        "vxeh": true,
-+        "vxpd": true,
-+        "esop": true,
-+        "msa9_pckmo": true,
-+        "vxeh2": true,
-+        "esort": true,
-+        "appv": true,
-+        "apqi": true,
-+        "apft": true,
-+        "els": true,
-+        "iep": true,
-+        "appvi": true,
-+        "apqci": true,
-+        "cte": true,
-+        "ais": true,
-+        "bpb": true,
-+        "ctop": true,
-+        "gs": true,
-+        "ppa15": true,
-+        "zpci": true,
-+        "rdp": true,
-+        "sea_esop2": true,
-+        "beareh": true,
-+        "te": true,
-+        "cmm": true,
-+        "vxpdeh2": true
-+      }
-+    }
-+  },
-+  "id": "libvirt-41"
-+}
-+
-+{
-+  "execute": "qmp_capabilities",
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "return": {},
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "execute": "query-cpu-definitions",
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "z13",
-+      "typename": "z13-s390x-cpu",
-+      "unavailable-features": [
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "bpb",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.3",
-+      "typename": "z990.3-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z13-base",
-+      "typename": "z13-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfppc",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.2",
-+      "typename": "z990.2-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z196.2-base",
-+      "typename": "z196.2-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14",
-+      "typename": "z14-s390x-cpu",
-+      "unavailable-features": [
-+        "kma-gcm-eaes-256",
-+        "kma-gcm-eaes-192",
-+        "kma-gcm-eaes-128",
-+        "kma-gcm-aes-256",
-+        "kma-gcm-aes-192",
-+        "kma-gcm-aes-128",
-+        "prno-trng-qrtcr",
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "mepoch",
-+        "vxpd",
-+        "gs",
-+        "bpb",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "mepochptff",
-+        "msa6",
-+        "msa1",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14.2-base",
-+      "typename": "z14.2-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfppc",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.4",
-+      "typename": "z990.4-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z196",
-+      "typename": "z196-s390x-cpu",
-+      "unavailable-features": [
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "bpb",
-+        "ppa15",
-+        "sthyi",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10BC.2-base",
-+      "typename": "z10BC.2-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "csske",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z114-base",
-+      "typename": "z114-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen16b",
-+      "typename": "gen16b-s390x-cpu",
-+      "unavailable-features": [
-+        "kma-gcm-eaes-256",
-+        "kma-gcm-eaes-192",
-+        "kma-gcm-eaes-128",
-+        "kma-gcm-aes-256",
-+        "kma-gcm-aes-192",
-+        "kma-gcm-aes-128",
-+        "prno-trng-qrtcr",
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "paie",
-+        "pai",
-+        "rdp",
-+        "beareh",
-+        "vxpdeh2",
-+        "nnpa",
-+        "etoken",
-+        "vxpdeh",
-+        "mepoch",
-+        "vxpd",
-+        "gs",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "edat",
-+        "asnlxr",
-+        "deflate",
-+        "mepochptff",
-+        "msa9_pckmo",
-+        "msa9",
-+        "msa6",
-+        "msa1",
-+        "gen13ptff",
-+        "tods",
-+        "type"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890.3-base",
-+      "typename": "z890.3-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen16a",
-+      "typename": "gen16a-s390x-cpu",
-+      "unavailable-features": [
-+        "kma-gcm-eaes-256",
-+        "kma-gcm-eaes-192",
-+        "kma-gcm-eaes-128",
-+        "kma-gcm-aes-256",
-+        "kma-gcm-aes-192",
-+        "kma-gcm-aes-128",
-+        "prno-trng-qrtcr",
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "paie",
-+        "pai",
-+        "rdp",
-+        "beareh",
-+        "vxpdeh2",
-+        "nnpa",
-+        "etoken",
-+        "vxpdeh",
-+        "mepoch",
-+        "vxpd",
-+        "gs",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "edat",
-+        "asnlxr",
-+        "deflate",
-+        "mepochptff",
-+        "msa9_pckmo",
-+        "msa9",
-+        "msa6",
-+        "msa1",
-+        "gen13ptff",
-+        "tods",
-+        "type"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.5",
-+      "typename": "z990.5-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z196.2",
-+      "typename": "z196.2-s390x-cpu",
-+      "unavailable-features": [
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "bpb",
-+        "ppa15",
-+        "sthyi",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC.2",
-+      "typename": "z9EC.2-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "sthyi",
-+        "hfpue",
-+        "hfpm",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zEC12",
-+      "typename": "zEC12-s390x-cpu",
-+      "unavailable-features": [
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "bpb",
-+        "ppa15",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zEC12.2",
-+      "typename": "zEC12.2-s390x-cpu",
-+      "unavailable-features": [
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "bpb",
-+        "ppa15",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9BC",
-+      "typename": "z9BC-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "sthyi",
-+        "hfpue",
-+        "hfpm",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC.3-base",
-+      "typename": "z9EC.3-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "hfpue",
-+        "hfpm",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z800-base",
-+      "typename": "z800-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14ZR1-base",
-+      "typename": "z14ZR1-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfppc",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890",
-+      "typename": "z890-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen17a-base",
-+      "typename": "gen17a-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "sif",
-+        "minste4",
-+        "dfppc",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "asnlxr",
-+        "msa12",
-+        "gen13ptff",
-+        "tods",
-+        "plo_ext",
-+        "type"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.4-base",
-+      "typename": "z990.4-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC.3",
-+      "typename": "z9EC.3-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "sthyi",
-+        "hfpue",
-+        "hfpm",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z13.2",
-+      "typename": "z13.2-s390x-cpu",
-+      "unavailable-features": [
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "bpb",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10BC.2",
-+      "typename": "z10BC.2-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "sthyi",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen15a-base",
-+      "typename": "gen15a-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfppc",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "asnlxr",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14.2",
-+      "typename": "z14.2-s390x-cpu",
-+      "unavailable-features": [
-+        "kma-gcm-eaes-256",
-+        "kma-gcm-eaes-192",
-+        "kma-gcm-eaes-128",
-+        "kma-gcm-aes-256",
-+        "kma-gcm-aes-192",
-+        "kma-gcm-aes-128",
-+        "prno-trng-qrtcr",
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "mepoch",
-+        "vxpd",
-+        "gs",
-+        "bpb",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "mepochptff",
-+        "msa6",
-+        "msa1",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zBC12-base",
-+      "typename": "zBC12-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen16a-base",
-+      "typename": "gen16a-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfppc",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "asnlxr",
-+        "gen13ptff",
-+        "tods",
-+        "type"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900.3",
-+      "typename": "z900.3-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z196-base",
-+      "typename": "z196-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990",
-+      "typename": "z990-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14-base",
-+      "typename": "z14-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfppc",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900.2",
-+      "typename": "z900.2-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z800",
-+      "typename": "z800-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC",
-+      "typename": "z10EC-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "sthyi",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z14ZR1",
-+      "typename": "z14ZR1-s390x-cpu",
-+      "unavailable-features": [
-+        "kma-gcm-eaes-256",
-+        "kma-gcm-eaes-192",
-+        "kma-gcm-eaes-128",
-+        "kma-gcm-aes-256",
-+        "kma-gcm-aes-192",
-+        "kma-gcm-aes-128",
-+        "prno-trng-qrtcr",
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "mepoch",
-+        "vxpd",
-+        "gs",
-+        "bpb",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "mepochptff",
-+        "msa6",
-+        "msa1",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900",
-+      "typename": "z900-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC.2-base",
-+      "typename": "z10EC.2-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "csske",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC.2",
-+      "typename": "z10EC.2-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "sthyi",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900.2-base",
-+      "typename": "z900.2-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900-base",
-+      "typename": "z900-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC.3",
-+      "typename": "z10EC.3-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "sthyi",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.5-base",
-+      "typename": "z990.5-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "max",
-+      "typename": "max-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen15b",
-+      "typename": "gen15b-s390x-cpu",
-+      "unavailable-features": [
-+        "kma-gcm-eaes-256",
-+        "kma-gcm-eaes-192",
-+        "kma-gcm-eaes-128",
-+        "kma-gcm-aes-256",
-+        "kma-gcm-aes-192",
-+        "kma-gcm-aes-128",
-+        "prno-trng-qrtcr",
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "etoken",
-+        "vxpdeh",
-+        "mepoch",
-+        "vxpd",
-+        "gs",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "edat",
-+        "asnlxr",
-+        "deflate",
-+        "mepochptff",
-+        "msa9_pckmo",
-+        "msa9",
-+        "msa6",
-+        "msa1",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9BC.2-base",
-+      "typename": "z9BC.2-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "hfpue",
-+        "hfpm",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen15a",
-+      "typename": "gen15a-s390x-cpu",
-+      "unavailable-features": [
-+        "kma-gcm-eaes-256",
-+        "kma-gcm-eaes-192",
-+        "kma-gcm-eaes-128",
-+        "kma-gcm-aes-256",
-+        "kma-gcm-aes-192",
-+        "kma-gcm-aes-128",
-+        "prno-trng-qrtcr",
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "etoken",
-+        "vxpdeh",
-+        "mepoch",
-+        "vxpd",
-+        "gs",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "edat",
-+        "asnlxr",
-+        "deflate",
-+        "mepochptff",
-+        "msa9_pckmo",
-+        "msa9",
-+        "msa6",
-+        "msa1",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.2-base",
-+      "typename": "z990.2-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC-base",
-+      "typename": "z10EC-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "csske",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen16b-base",
-+      "typename": "gen16b-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfppc",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "asnlxr",
-+        "gen13ptff",
-+        "tods",
-+        "type"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z114",
-+      "typename": "z114-s390x-cpu",
-+      "unavailable-features": [
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "bpb",
-+        "ppa15",
-+        "sthyi",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen17b-base",
-+      "typename": "gen17b-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "sif",
-+        "minste4",
-+        "dfppc",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "asnlxr",
-+        "msa12",
-+        "gen13ptff",
-+        "tods",
-+        "plo_ext",
-+        "type"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC-base",
-+      "typename": "z9EC-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "hfpue",
-+        "hfpm",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z13s",
-+      "typename": "z13s-s390x-cpu",
-+      "unavailable-features": [
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "bpb",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen17a",
-+      "typename": "gen17a-s390x-cpu",
-+      "unavailable-features": [
-+        "kma-gcm-eaes-256",
-+        "kma-gcm-eaes-192",
-+        "kma-gcm-eaes-128",
-+        "kma-gcm-aes-256",
-+        "kma-gcm-aes-192",
-+        "kma-gcm-aes-128",
-+        "prno-trng-qrtcr",
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "vxpdeh3",
-+        "vxeh3",
-+        "paie",
-+        "pai",
-+        "rdp",
-+        "beareh",
-+        "vxpdeh2",
-+        "nnpa",
-+        "etoken",
-+        "vxpdeh",
-+        "mepoch",
-+        "vxpd",
-+        "gs",
-+        "sif",
-+        "minste4",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "edat",
-+        "asnlxr",
-+        "deflate",
-+        "mepochptff",
-+        "msa13_pckmo",
-+        "msa13",
-+        "msa12",
-+        "msa11_pckmo",
-+        "msa11",
-+        "msa10_pckmo",
-+        "msa10",
-+        "msa9_pckmo",
-+        "msa9",
-+        "msa6",
-+        "msa1",
-+        "gen13ptff",
-+        "tods",
-+        "plo_ext",
-+        "type"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "qemu",
-+      "typename": "qemu-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen15b-base",
-+      "typename": "gen15b-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfppc",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "asnlxr",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zEC12-base",
-+      "typename": "zEC12-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890.3",
-+      "typename": "z890.3-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10EC.3-base",
-+      "typename": "z10EC.3-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "csske",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890.2-base",
-+      "typename": "z890.2-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890.2",
-+      "typename": "z890.2-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "gen17b",
-+      "typename": "gen17b-s390x-cpu",
-+      "unavailable-features": [
-+        "kma-gcm-eaes-256",
-+        "kma-gcm-eaes-192",
-+        "kma-gcm-eaes-128",
-+        "kma-gcm-aes-256",
-+        "kma-gcm-aes-192",
-+        "kma-gcm-aes-128",
-+        "prno-trng-qrtcr",
-+        "ppno-sha-512-drng",
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "vxpdeh3",
-+        "vxeh3",
-+        "paie",
-+        "pai",
-+        "rdp",
-+        "beareh",
-+        "vxpdeh2",
-+        "nnpa",
-+        "etoken",
-+        "vxpdeh",
-+        "mepoch",
-+        "vxpd",
-+        "gs",
-+        "sif",
-+        "minste4",
-+        "ppa15",
-+        "dfppc",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "tsi",
-+        "sema",
-+        "eec",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "opc",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "edat",
-+        "asnlxr",
-+        "deflate",
-+        "mepochptff",
-+        "msa13_pckmo",
-+        "msa13",
-+        "msa12",
-+        "msa11_pckmo",
-+        "msa11",
-+        "msa10_pckmo",
-+        "msa10",
-+        "msa9_pckmo",
-+        "msa9",
-+        "msa6",
-+        "msa1",
-+        "gen13ptff",
-+        "tods",
-+        "plo_ext",
-+        "type"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10BC-base",
-+      "typename": "z10BC-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "csske",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zEC12.2-base",
-+      "typename": "zEC12.2-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z890-base",
-+      "typename": "z890-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9BC-base",
-+      "typename": "z9BC-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "hfpue",
-+        "hfpm",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z10BC",
-+      "typename": "z10BC-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "sthyi",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC",
-+      "typename": "z9EC-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "sthyi",
-+        "hfpue",
-+        "hfpm",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9EC.2-base",
-+      "typename": "z9EC.2-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "hfpue",
-+        "hfpm",
-+        "asnlxr",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z900.3-base",
-+      "typename": "z900.3-base-s390x-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z13.2-base",
-+      "typename": "z13.2-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfppc",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990.3-base",
-+      "typename": "z990.3-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z13s-base",
-+      "typename": "z13s-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "dateh2",
-+        "dfppc",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "csske",
-+        "asnlxr",
-+        "gen13ptff",
-+        "tods"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "zBC12",
-+      "typename": "zBC12-s390x-cpu",
-+      "unavailable-features": [
-+        "pcc-xts-eaes-256",
-+        "pcc-xts-eaes-128",
-+        "pcc-xts-aes-256",
-+        "pcc-xts-aes-128",
-+        "pcc-cmac-eaes-256",
-+        "pcc-cmac-eaes-192",
-+        "pcc-cmac-eaes-128",
-+        "pcc-cmac-aes-256",
-+        "pcc-cmac-aes-192",
-+        "pcc-cmac-aes-128",
-+        "pcc-cmac-etdea-192",
-+        "pcc-cmac-etdea-128",
-+        "pcc-cmac-edea",
-+        "pcc-cmac-tdea-192",
-+        "pcc-cmac-tdea-128",
-+        "pcc-cmac-dea",
-+        "kmo-eaes-256",
-+        "kmo-eaes-192",
-+        "kmo-eaes-128",
-+        "kmo-aes-256",
-+        "kmo-aes-192",
-+        "kmo-aes-128",
-+        "kmo-etdea-192",
-+        "kmo-etdea-128",
-+        "kmo-edea",
-+        "kmo-tdea-192",
-+        "kmo-tdea-128",
-+        "kmo-dea",
-+        "kmf-eaes-256",
-+        "kmf-eaes-192",
-+        "kmf-eaes-128",
-+        "kmf-aes-256",
-+        "kmf-aes-192",
-+        "kmf-aes-128",
-+        "kmf-etdea-192",
-+        "kmf-etdea-128",
-+        "kmf-edea",
-+        "kmf-tdea-192",
-+        "kmf-tdea-128",
-+        "kmf-dea",
-+        "kmctr-eaes-256",
-+        "kmctr-eaes-192",
-+        "kmctr-eaes-128",
-+        "kmctr-aes-256",
-+        "kmctr-aes-192",
-+        "kmctr-aes-128",
-+        "kmctr-etdea-192",
-+        "kmctr-etdea-128",
-+        "kmctr-edea",
-+        "kmctr-tdea-192",
-+        "kmctr-tdea-128",
-+        "kmctr-dea",
-+        "pckmo-aes-256",
-+        "pckmo-aes-192",
-+        "pckmo-aes-128",
-+        "pckmo-etdea-192",
-+        "pckmo-etdea-128",
-+        "pckmo-edea",
-+        "klmd-sha-1",
-+        "kimd-ghash",
-+        "kimd-sha-1",
-+        "km-xts-eaes-256",
-+        "km-xts-eaes-128",
-+        "km-xts-aes-256",
-+        "km-xts-aes-128",
-+        "km-eaes-256",
-+        "km-eaes-192",
-+        "km-eaes-128",
-+        "km-aes-256",
-+        "km-aes-192",
-+        "km-etdea-192",
-+        "km-etdea-128",
-+        "km-edea",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-prng",
-+        "kmc-eaes-256",
-+        "kmc-eaes-192",
-+        "kmc-eaes-128",
-+        "kmc-aes-256",
-+        "kmc-aes-192",
-+        "kmc-etdea-192",
-+        "kmc-etdea-128",
-+        "kmc-edea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-eaes-256",
-+        "kmac-eaes-192",
-+        "kmac-eaes-128",
-+        "kmac-aes-256",
-+        "kmac-aes-192",
-+        "kmac-aes-128",
-+        "kmac-etdea-192",
-+        "kmac-etdea-128",
-+        "kmac-edea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "bpb",
-+        "ppa15",
-+        "edat2",
-+        "sthyi",
-+        "te",
-+        "ri",
-+        "cte",
-+        "dfpzc",
-+        "cmpsceh",
-+        "pfpo",
-+        "dfphp",
-+        "dfp",
-+        "emon",
-+        "parseh",
-+        "hfpue",
-+        "hfpm",
-+        "nonqks",
-+        "ipter",
-+        "csske",
-+        "edat",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z990-base",
-+      "typename": "z990-base-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "hfpm"
-+      ],
-+      "static": true,
-+      "migration-safe": true,
-+      "deprecated": false
-+    },
-+    {
-+      "name": "z9BC.2",
-+      "typename": "z9BC.2-s390x-cpu",
-+      "unavailable-features": [
-+        "klmd-sha-1",
-+        "kimd-sha-1",
-+        "km-tdea-192",
-+        "km-tdea-128",
-+        "km-dea",
-+        "kmc-tdea-192",
-+        "kmc-tdea-128",
-+        "kmc-dea",
-+        "kmac-tdea-192",
-+        "kmac-tdea-128",
-+        "kmac-dea",
-+        "cmm",
-+        "dateh2",
-+        "sthyi",
-+        "hfpue",
-+        "hfpm",
-+        "asnlxr",
-+        "msa1",
-+        "tods"
-+      ],
-+      "static": false,
-+      "migration-safe": true,
-+      "deprecated": false
-+    }
-+  ],
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "max"
-+    }
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "return": {
-+    "deprecated-props": [],
-+    "model": {
-+      "name": "gen15a-base",
-+      "props": {
-+        "dateh2": false,
-+        "aen": true,
-+        "gen13ptff": false,
-+        "kmac-tdea-192": false,
-+        "kimd-sha-512": true,
-+        "kmc-tdea-192": false,
-+        "parseh": false,
-+        "klmd-sha-512": true,
-+        "aefsi": true,
-+        "hfpm": false,
-+        "hfpue": false,
-+        "dfp": false,
-+        "km-dea": false,
-+        "vx": true,
-+        "emon": false,
-+        "kimd-sha-1": false,
-+        "cmpsceh": false,
-+        "dfppc": false,
-+        "dfpzc": false,
-+        "dfphp": false,
-+        "kmc-dea": false,
-+        "klmd-sha-1": false,
-+        "opc": false,
-+        "asnlxr": false,
-+        "vxeh": true,
-+        "esop": true,
-+        "km-tdea-192": false,
-+        "km-tdea-128": false,
-+        "vxeh2": true,
-+        "tsi": false,
-+        "kmac-dea": false,
-+        "iep": true,
-+        "kmc-tdea-128": false,
-+        "prno-trng": true,
-+        "ais": true,
-+        "kmac-tdea-128": false,
-+        "sema": false,
-+        "eec": false,
-+        "zpci": true,
-+        "nonqks": false,
-+        "sea_esop2": true,
-+        "pfpo": false,
-+        "msa8-base": true,
-+        "msa4-base": true,
-+        "msa3-base": true,
-+        "msa5-base": true,
-+        "tods": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-8.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-6.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-2.11",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-7.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-5.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-9.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-4.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-8.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "none",
-+      "numa-mem-supported": false,
-+      "acpi": false,
-+      "cpu-max": 1,
-+      "deprecated": false,
-+      "default-ram-id": "ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-6.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-3.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-7.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "x-remote",
-+      "numa-mem-supported": false,
-+      "acpi": false,
-+      "cpu-max": 1,
-+      "deprecated": false
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-5.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-4.2",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-2.10",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-9.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-10.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "is-default": true,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram",
-+      "alias": "s390-ccw-virtio"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-8.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-6.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-2.12",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-7.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-5.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-2.9",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-4.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-3.1",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": true,
-+      "default-ram-id": "s390.ram"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "s390-ccw-virtio-9.0",
-+      "numa-mem-supported": false,
-+      "default-cpu-type": "qemu-s390x-cpu",
-+      "acpi": false,
-+      "cpu-max": 248,
-+      "deprecated": false,
-+      "default-ram-id": "s390.ram"
-+    }
-+  ],
-+  "id": "libvirt-4"
-+}
-diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
-new file mode 100644
-index 0000000000..5c5ab096d1
---- /dev/null
-+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
-@@ -0,0 +1,4202 @@
-+<qemuCaps>
-+  <emulator>/usr/bin/qemu-system-s390x</emulator>
-+  <qemuctime>0</qemuctime>
-+  <selfctime>0</selfctime>
-+  <selfvers>0</selfvers>
-+  <flag name='kvm'/>
-+  <flag name='sdl'/>
-+  <flag name='ccid-emulated'/>
-+  <flag name='ccid-passthru'/>
-+  <flag name='usb-redir'/>
-+  <flag name='usb-hub'/>
-+  <flag name='scsi-disk.channel'/>
-+  <flag name='scsi-block'/>
-+  <flag name='virtio-scsi-pci'/>
-+  <flag name='usb-redir.filter'/>
-+  <flag name='seccomp-sandbox'/>
-+  <flag name='vnc'/>
-+  <flag name='s390-sclp'/>
-+  <flag name='usb-serial'/>
-+  <flag name='virtio-rng'/>
-+  <flag name='rng-random'/>
-+  <flag name='rng-egd'/>
-+  <flag name='virtio-ccw'/>
-+  <flag name='pci-bridge'/>
-+  <flag name='vfio-pci'/>
-+  <flag name='usb-storage'/>
-+  <flag name='usb-kbd'/>
-+  <flag name='usb-audio'/>
-+  <flag name='migrate-rdma'/>
-+  <flag name='virtio-net'/>
-+  <flag name='virtio-gpu'/>
-+  <flag name='virtio-keyboard'/>
-+  <flag name='virtio-mouse'/>
-+  <flag name='virtio-tablet'/>
-+  <flag name='virtio-input-host'/>
-+  <flag name='virtio-balloon-pci.deflate-on-oom'/>
-+  <flag name='vhost-scsi'/>
-+  <flag name='query-cpu-model-expansion'/>
-+  <flag name='query-cpu-definitions'/>
-+  <flag name='qemu-xhci'/>
-+  <flag name='chardev-reconnect'/>
-+  <flag name='sclplmconsole'/>
-+  <flag name='virtio-gpu-ccw'/>
-+  <flag name='virtio-keyboard-ccw'/>
-+  <flag name='virtio-mouse-ccw'/>
-+  <flag name='virtio-tablet-ccw'/>
-+  <flag name='nbd-tls'/>
-+  <flag name='pr-manager-helper'/>
-+  <flag name='vfio-ccw'/>
-+  <flag name='screendump_device'/>
-+  <flag name='vhost-vsock'/>
-+  <flag name='egl-headless'/>
-+  <flag name='vfio-ap'/>
-+  <flag name='zpci'/>
-+  <flag name='memory-backend-memfd'/>
-+  <flag name='memory-backend-memfd.hugetlb'/>
-+  <flag name='egl-headless.rendernode'/>
-+  <flag name='virtio-pci-non-transitional'/>
-+  <flag name='nbd-bitmap'/>
-+  <flag name='migration-file-drop-cache'/>
-+  <flag name='dbus-vmstate'/>
-+  <flag name='vhost-user-gpu'/>
-+  <flag name='incremental-backup'/>
-+  <flag name='query-cpu-model-baseline'/>
-+  <flag name='query-cpu-model-comparison'/>
-+  <flag name='drive-nvme'/>
-+  <flag name='smp-dies'/>
-+  <flag name='rng-builtin'/>
-+  <flag name='vhost-user-fs'/>
-+  <flag name='query-named-block-nodes.flat'/>
-+  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-+  <flag name='blockdev-reopen'/>
-+  <flag name='fsdev.multidevs'/>
-+  <flag name='aio.io_uring'/>
-+  <flag name='tcg'/>
-+  <flag name='numa.hmat'/>
-+  <flag name='usb-host.hostdevice'/>
-+  <flag name='virtio-balloon.free-page-reporting'/>
-+  <flag name='block-export-add'/>
-+  <flag name='netdev.vhost-vdpa'/>
-+  <flag name='vhost-user-fs.bootindex'/>
-+  <flag name='vhost-user-blk'/>
-+  <flag name='cpu-max'/>
-+  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-+  <flag name='migration-param.block-bitmap-mapping'/>
-+  <flag name='vnc-power-control'/>
-+  <flag name='object.qapified'/>
-+  <flag name='rotation-rate'/>
-+  <flag name='compat-deprecated'/>
-+  <flag name='acpi-index'/>
-+  <flag name='input-linux'/>
-+  <flag name='virtio-gpu-gl-pci'/>
-+  <flag name='confidential-guest-support'/>
-+  <flag name='s390-pv-guest'/>
-+  <flag name='set-action'/>
-+  <flag name='virtio-blk.queue-size'/>
-+  <flag name='virtio-mem-pci'/>
-+  <flag name='memory-backend-file.reserve'/>
-+  <flag name='netdev.json'/>
-+  <flag name='query-dirty-rate'/>
-+  <flag name='rbd-encryption'/>
-+  <flag name='sev-guest-kernel-hashes'/>
-+  <flag name='device.json+hotplug'/>
-+  <flag name='virtio-mem-pci.prealloc'/>
-+  <flag name='calc-dirty-rate'/>
-+  <flag name='dirtyrate-param.mode'/>
-+  <flag name='blockdev.nbd.tls-hostname'/>
-+  <flag name='memory-backend-file.prealloc-threads'/>
-+  <flag name='virtio-iommu-pci'/>
-+  <flag name='virtio-iommu.boot-bypass'/>
-+  <flag name='virtio-net.rss'/>
-+  <flag name='display-dbus'/>
-+  <flag name='iothread.thread-pool-max'/>
-+  <flag name='usb-host.guest-resets-all'/>
-+  <flag name='migration.blocked-reasons'/>
-+  <flag name='query-stats'/>
-+  <flag name='query-stats-schemas'/>
-+  <flag name='thread-context'/>
-+  <flag name='screenshot-format-png'/>
-+  <flag name='netdev.stream'/>
-+  <flag name='virtio-crypto'/>
-+  <flag name='cryptodev-backend-lkcf'/>
-+  <flag name='netdev.stream.reconnect'/>
-+  <flag name='virtio-gpu.blob'/>
-+  <flag name='rbd-encryption-layering'/>
-+  <flag name='rbd-encryption-luks-any'/>
-+  <flag name='qcow2-discard-no-unref'/>
-+  <flag name='run-with.async-teardown'/>
-+  <flag name='virtio-blk-vhost-vdpa'/>
-+  <flag name='virtio-blk.iothread-mapping'/>
-+  <flag name='smp-clusters'/>
-+  <flag name='virtio-mem-pci.dynamic-memslots'/>
-+  <flag name='blockjob.backing-mask-protocol'/>
-+  <flag name='display-reload'/>
-+  <flag name='usb-mtp'/>
-+  <flag name='virtio-sound'/>
-+  <flag name='netdev.user'/>
-+  <flag name='snapshot-internal-qmp'/>
-+  <flag name='chardev-reconnect-miliseconds'/>
-+  <flag name='virtio-ccw.loadparm'/>
-+  <flag name='netdev-stream-reconnect-miliseconds'/>
-+  <version>9002050</version>
-+  <microcodeVersion>39100285</microcodeVersion>
-+  <package>v9.2.0-1203-gd6430c17d7</package>
-+  <arch>s390x</arch>
-+  <hostCPU type='kvm' model='gen16a-base' migratability='no'>
-+    <property name='nnpa' type='boolean' value='true'/>
-+    <property name='aen' type='boolean' value='true'/>
-+    <property name='cmmnt' type='boolean' value='true'/>
-+    <property name='vxpdeh' type='boolean' value='true'/>
-+    <property name='aefsi' type='boolean' value='true'/>
-+    <property name='diag318' type='boolean' value='true'/>
-+    <property name='csske' type='boolean' value='true'/>
-+    <property name='mepoch' type='boolean' value='true'/>
-+    <property name='msa9' type='boolean' value='true'/>
-+    <property name='msa8' type='boolean' value='true'/>
-+    <property name='msa7' type='boolean' value='true'/>
-+    <property name='msa6' type='boolean' value='true'/>
-+    <property name='msa5' type='boolean' value='true'/>
-+    <property name='msa4' type='boolean' value='true'/>
-+    <property name='msa3' type='boolean' value='true'/>
-+    <property name='msa2' type='boolean' value='true'/>
-+    <property name='msa1' type='boolean' value='true'/>
-+    <property name='sthyi' type='boolean' value='true'/>
-+    <property name='edat' type='boolean' value='true'/>
-+    <property name='ri' type='boolean' value='true'/>
-+    <property name='deflate' type='boolean' value='true'/>
-+    <property name='edat2' type='boolean' value='true'/>
-+    <property name='etoken' type='boolean' value='true'/>
-+    <property name='vx' type='boolean' value='true'/>
-+    <property name='ipter' type='boolean' value='true'/>
-+    <property name='pai' type='boolean' value='true'/>
-+    <property name='paie' type='boolean' value='true'/>
-+    <property name='mepochptff' type='boolean' value='true'/>
-+    <property name='ap' type='boolean' value='true'/>
-+    <property name='vxeh' type='boolean' value='true'/>
-+    <property name='vxpd' type='boolean' value='true'/>
-+    <property name='esop' type='boolean' value='true'/>
-+    <property name='msa9_pckmo' type='boolean' value='true'/>
-+    <property name='vxeh2' type='boolean' value='true'/>
-+    <property name='esort' type='boolean' value='true'/>
-+    <property name='appv' type='boolean' value='true'/>
-+    <property name='apqi' type='boolean' value='true'/>
-+    <property name='apft' type='boolean' value='true'/>
-+    <property name='els' type='boolean' value='true'/>
-+    <property name='iep' type='boolean' value='true'/>
-+    <property name='appvi' type='boolean' value='true'/>
-+    <property name='apqci' type='boolean' value='true'/>
-+    <property name='cte' type='boolean' value='true'/>
-+    <property name='ais' type='boolean' value='true'/>
-+    <property name='bpb' type='boolean' value='true'/>
-+    <property name='ctop' type='boolean' value='true'/>
-+    <property name='gs' type='boolean' value='true'/>
-+    <property name='ppa15' type='boolean' value='true'/>
-+    <property name='zpci' type='boolean' value='true'/>
-+    <property name='rdp' type='boolean' value='true'/>
-+    <property name='sea_esop2' type='boolean' value='true'/>
-+    <property name='beareh' type='boolean' value='true'/>
-+    <property name='te' type='boolean' value='true'/>
-+    <property name='cmm' type='boolean' value='true'/>
-+    <property name='vxpdeh2' type='boolean' value='true'/>
-+  </hostCPU>
-+  <cpu type='kvm' name='z13' typename='z13-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z13-base' typename='z13-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z990.2' typename='z990.2-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='host' typename='host-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z990.4' typename='z990.4-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z196' typename='z196-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z114-base' typename='z114-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen16b' typename='gen16b-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen16a' typename='gen16a-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z990.5' typename='z990.5-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z196.2' typename='z196.2-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='zEC12' typename='zEC12-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z890' typename='z890-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen17a-base' typename='gen17a-base-s390x-cpu' usable='no'>
-+    <blocker name='sif'/>
-+    <blocker name='minste4'/>
-+    <blocker name='msa12'/>
-+    <blocker name='plo_ext'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z13.2' typename='z13.2-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z14.2' typename='z14.2-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen16a-base' typename='gen16a-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z196-base' typename='z196-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z990' typename='z990-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z800' typename='z800-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z10EC' typename='z10EC-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z900' typename='z900-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='max' typename='max-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen15b' typename='gen15b-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen15a' typename='gen15a-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen16b-base' typename='gen16b-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z114' typename='z114-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen17b-base' typename='gen17b-base-s390x-cpu' usable='no'>
-+    <blocker name='sif'/>
-+    <blocker name='minste4'/>
-+    <blocker name='msa12'/>
-+    <blocker name='plo_ext'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='kvm' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z13s' typename='z13s-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen17a' typename='gen17a-s390x-cpu' usable='no'>
-+    <blocker name='vxpdeh3'/>
-+    <blocker name='vxeh3'/>
-+    <blocker name='sif'/>
-+    <blocker name='minste4'/>
-+    <blocker name='msa13_pckmo'/>
-+    <blocker name='msa13'/>
-+    <blocker name='msa12'/>
-+    <blocker name='msa11_pckmo'/>
-+    <blocker name='msa11'/>
-+    <blocker name='msa10_pckmo'/>
-+    <blocker name='msa10'/>
-+    <blocker name='plo_ext'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z890.3' typename='z890.3-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z890.2' typename='z890.2-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='gen17b' typename='gen17b-s390x-cpu' usable='no'>
-+    <blocker name='vxpdeh3'/>
-+    <blocker name='vxeh3'/>
-+    <blocker name='sif'/>
-+    <blocker name='minste4'/>
-+    <blocker name='msa13_pckmo'/>
-+    <blocker name='msa13'/>
-+    <blocker name='msa12'/>
-+    <blocker name='msa11_pckmo'/>
-+    <blocker name='msa11'/>
-+    <blocker name='msa10_pckmo'/>
-+    <blocker name='msa10'/>
-+    <blocker name='plo_ext'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z890-base' typename='z890-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z10BC' typename='z10BC-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z9EC' typename='z9EC-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z13s-base' typename='z13s-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='zBC12' typename='zBC12-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z990-base' typename='z990-base-s390x-cpu' usable='yes'/>
-+  <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-10.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-8.0' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-6.0' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-7.0' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-5.0' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-9.2' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-4.0' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-8.2' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-6.2' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-7.2' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='kvm' name='x-remote' maxCpus='1' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-5.2' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-4.2' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-9.1' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-8.1' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-6.1' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-7.1' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-5.1' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-4.1' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='kvm' name='s390-ccw-virtio-9.0' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <hostCPU type='tcg' model='gen15a-base' migratability='no'>
-+    <property name='dateh2' type='boolean' value='false'/>
-+    <property name='aen' type='boolean' value='true'/>
-+    <property name='gen13ptff' type='boolean' value='false'/>
-+    <property name='kmac-tdea-192' type='boolean' value='false'/>
-+    <property name='kimd-sha-512' type='boolean' value='true'/>
-+    <property name='kmc-tdea-192' type='boolean' value='false'/>
-+    <property name='parseh' type='boolean' value='false'/>
-+    <property name='klmd-sha-512' type='boolean' value='true'/>
-+    <property name='aefsi' type='boolean' value='true'/>
-+    <property name='hfpm' type='boolean' value='false'/>
-+    <property name='hfpue' type='boolean' value='false'/>
-+    <property name='dfp' type='boolean' value='false'/>
-+    <property name='km-dea' type='boolean' value='false'/>
-+    <property name='vx' type='boolean' value='true'/>
-+    <property name='emon' type='boolean' value='false'/>
-+    <property name='kimd-sha-1' type='boolean' value='false'/>
-+    <property name='cmpsceh' type='boolean' value='false'/>
-+    <property name='dfppc' type='boolean' value='false'/>
-+    <property name='dfpzc' type='boolean' value='false'/>
-+    <property name='dfphp' type='boolean' value='false'/>
-+    <property name='kmc-dea' type='boolean' value='false'/>
-+    <property name='klmd-sha-1' type='boolean' value='false'/>
-+    <property name='opc' type='boolean' value='false'/>
-+    <property name='asnlxr' type='boolean' value='false'/>
-+    <property name='vxeh' type='boolean' value='true'/>
-+    <property name='esop' type='boolean' value='true'/>
-+    <property name='km-tdea-192' type='boolean' value='false'/>
-+    <property name='km-tdea-128' type='boolean' value='false'/>
-+    <property name='vxeh2' type='boolean' value='true'/>
-+    <property name='tsi' type='boolean' value='false'/>
-+    <property name='kmac-dea' type='boolean' value='false'/>
-+    <property name='iep' type='boolean' value='true'/>
-+    <property name='kmc-tdea-128' type='boolean' value='false'/>
-+    <property name='prno-trng' type='boolean' value='true'/>
-+    <property name='ais' type='boolean' value='true'/>
-+    <property name='kmac-tdea-128' type='boolean' value='false'/>
-+    <property name='sema' type='boolean' value='false'/>
-+    <property name='eec' type='boolean' value='false'/>
-+    <property name='zpci' type='boolean' value='true'/>
-+    <property name='nonqks' type='boolean' value='false'/>
-+    <property name='sea_esop2' type='boolean' value='true'/>
-+    <property name='pfpo' type='boolean' value='false'/>
-+    <property name='msa8-base' type='boolean' value='true'/>
-+    <property name='msa4-base' type='boolean' value='true'/>
-+    <property name='msa3-base' type='boolean' value='true'/>
-+    <property name='msa5-base' type='boolean' value='true'/>
-+    <property name='tods' type='boolean' value='false'/>
-+  </hostCPU>
-+  <cpu type='tcg' name='z13' typename='z13-s390x-cpu' usable='no'>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z990.3' typename='z990.3-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='z13-base' typename='z13-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='host' typename='host-s390x-cpu' usable='yes'/>
-+  <cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z14' typename='z14-s390x-cpu' usable='no'>
-+    <blocker name='kma-gcm-eaes-256'/>
-+    <blocker name='kma-gcm-eaes-192'/>
-+    <blocker name='kma-gcm-eaes-128'/>
-+    <blocker name='kma-gcm-aes-256'/>
-+    <blocker name='kma-gcm-aes-192'/>
-+    <blocker name='kma-gcm-aes-128'/>
-+    <blocker name='prno-trng-qrtcr'/>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='mepoch'/>
-+    <blocker name='vxpd'/>
-+    <blocker name='gs'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='mepochptff'/>
-+    <blocker name='msa6'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z990.4' typename='z990.4-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='z196' typename='z196-s390x-cpu' usable='no'>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z114-base' typename='z114-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='gen16b' typename='gen16b-s390x-cpu' usable='no'>
-+    <blocker name='kma-gcm-eaes-256'/>
-+    <blocker name='kma-gcm-eaes-192'/>
-+    <blocker name='kma-gcm-eaes-128'/>
-+    <blocker name='kma-gcm-aes-256'/>
-+    <blocker name='kma-gcm-aes-192'/>
-+    <blocker name='kma-gcm-aes-128'/>
-+    <blocker name='prno-trng-qrtcr'/>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='paie'/>
-+    <blocker name='pai'/>
-+    <blocker name='rdp'/>
-+    <blocker name='beareh'/>
-+    <blocker name='vxpdeh2'/>
-+    <blocker name='nnpa'/>
-+    <blocker name='etoken'/>
-+    <blocker name='vxpdeh'/>
-+    <blocker name='mepoch'/>
-+    <blocker name='vxpd'/>
-+    <blocker name='gs'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='deflate'/>
-+    <blocker name='mepochptff'/>
-+    <blocker name='msa9_pckmo'/>
-+    <blocker name='msa9'/>
-+    <blocker name='msa6'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='tcg' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='gen16a' typename='gen16a-s390x-cpu' usable='no'>
-+    <blocker name='kma-gcm-eaes-256'/>
-+    <blocker name='kma-gcm-eaes-192'/>
-+    <blocker name='kma-gcm-eaes-128'/>
-+    <blocker name='kma-gcm-aes-256'/>
-+    <blocker name='kma-gcm-aes-192'/>
-+    <blocker name='kma-gcm-aes-128'/>
-+    <blocker name='prno-trng-qrtcr'/>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='paie'/>
-+    <blocker name='pai'/>
-+    <blocker name='rdp'/>
-+    <blocker name='beareh'/>
-+    <blocker name='vxpdeh2'/>
-+    <blocker name='nnpa'/>
-+    <blocker name='etoken'/>
-+    <blocker name='vxpdeh'/>
-+    <blocker name='mepoch'/>
-+    <blocker name='vxpd'/>
-+    <blocker name='gs'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='deflate'/>
-+    <blocker name='mepochptff'/>
-+    <blocker name='msa9_pckmo'/>
-+    <blocker name='msa9'/>
-+    <blocker name='msa6'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='tcg' name='z990.5' typename='z990.5-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='z196.2' typename='z196.2-s390x-cpu' usable='no'>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='zEC12' typename='zEC12-s390x-cpu' usable='no'>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='no'>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z9BC' typename='z9BC-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
-+  <cpu type='tcg' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z890' typename='z890-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='gen17a-base' typename='gen17a-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sif'/>
-+    <blocker name='minste4'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa12'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+    <blocker name='plo_ext'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='tcg' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z13.2' typename='z13.2-s390x-cpu' usable='no'>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z14.2' typename='z14.2-s390x-cpu' usable='no'>
-+    <blocker name='kma-gcm-eaes-256'/>
-+    <blocker name='kma-gcm-eaes-192'/>
-+    <blocker name='kma-gcm-eaes-128'/>
-+    <blocker name='kma-gcm-aes-256'/>
-+    <blocker name='kma-gcm-aes-192'/>
-+    <blocker name='kma-gcm-aes-128'/>
-+    <blocker name='prno-trng-qrtcr'/>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='mepoch'/>
-+    <blocker name='vxpd'/>
-+    <blocker name='gs'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='mepochptff'/>
-+    <blocker name='msa6'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='gen16a-base' typename='gen16a-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='tcg' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
-+  <cpu type='tcg' name='z196-base' typename='z196-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z990' typename='z990-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='z14-base' typename='z14-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
-+  <cpu type='tcg' name='z800' typename='z800-s390x-cpu' usable='yes'/>
-+  <cpu type='tcg' name='z10EC' typename='z10EC-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='no'>
-+    <blocker name='kma-gcm-eaes-256'/>
-+    <blocker name='kma-gcm-eaes-192'/>
-+    <blocker name='kma-gcm-eaes-128'/>
-+    <blocker name='kma-gcm-aes-256'/>
-+    <blocker name='kma-gcm-aes-192'/>
-+    <blocker name='kma-gcm-aes-128'/>
-+    <blocker name='prno-trng-qrtcr'/>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='mepoch'/>
-+    <blocker name='vxpd'/>
-+    <blocker name='gs'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='mepochptff'/>
-+    <blocker name='msa6'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z900' typename='z900-s390x-cpu' usable='yes'/>
-+  <cpu type='tcg' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/>
-+  <cpu type='tcg' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
-+  <cpu type='tcg' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='max' typename='max-s390x-cpu' usable='yes'/>
-+  <cpu type='tcg' name='gen15b' typename='gen15b-s390x-cpu' usable='no'>
-+    <blocker name='kma-gcm-eaes-256'/>
-+    <blocker name='kma-gcm-eaes-192'/>
-+    <blocker name='kma-gcm-eaes-128'/>
-+    <blocker name='kma-gcm-aes-256'/>
-+    <blocker name='kma-gcm-aes-192'/>
-+    <blocker name='kma-gcm-aes-128'/>
-+    <blocker name='prno-trng-qrtcr'/>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='etoken'/>
-+    <blocker name='vxpdeh'/>
-+    <blocker name='mepoch'/>
-+    <blocker name='vxpd'/>
-+    <blocker name='gs'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='deflate'/>
-+    <blocker name='mepochptff'/>
-+    <blocker name='msa9_pckmo'/>
-+    <blocker name='msa9'/>
-+    <blocker name='msa6'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='gen15a' typename='gen15a-s390x-cpu' usable='no'>
-+    <blocker name='kma-gcm-eaes-256'/>
-+    <blocker name='kma-gcm-eaes-192'/>
-+    <blocker name='kma-gcm-eaes-128'/>
-+    <blocker name='kma-gcm-aes-256'/>
-+    <blocker name='kma-gcm-aes-192'/>
-+    <blocker name='kma-gcm-aes-128'/>
-+    <blocker name='prno-trng-qrtcr'/>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='etoken'/>
-+    <blocker name='vxpdeh'/>
-+    <blocker name='mepoch'/>
-+    <blocker name='vxpd'/>
-+    <blocker name='gs'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='deflate'/>
-+    <blocker name='mepochptff'/>
-+    <blocker name='msa9_pckmo'/>
-+    <blocker name='msa9'/>
-+    <blocker name='msa6'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='gen16b-base' typename='gen16b-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='tcg' name='z114' typename='z114-s390x-cpu' usable='no'>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='gen17b-base' typename='gen17b-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sif'/>
-+    <blocker name='minste4'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa12'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+    <blocker name='plo_ext'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z13s' typename='z13s-s390x-cpu' usable='no'>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='gen17a' typename='gen17a-s390x-cpu' usable='no'>
-+    <blocker name='kma-gcm-eaes-256'/>
-+    <blocker name='kma-gcm-eaes-192'/>
-+    <blocker name='kma-gcm-eaes-128'/>
-+    <blocker name='kma-gcm-aes-256'/>
-+    <blocker name='kma-gcm-aes-192'/>
-+    <blocker name='kma-gcm-aes-128'/>
-+    <blocker name='prno-trng-qrtcr'/>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='vxpdeh3'/>
-+    <blocker name='vxeh3'/>
-+    <blocker name='paie'/>
-+    <blocker name='pai'/>
-+    <blocker name='rdp'/>
-+    <blocker name='beareh'/>
-+    <blocker name='vxpdeh2'/>
-+    <blocker name='nnpa'/>
-+    <blocker name='etoken'/>
-+    <blocker name='vxpdeh'/>
-+    <blocker name='mepoch'/>
-+    <blocker name='vxpd'/>
-+    <blocker name='gs'/>
-+    <blocker name='sif'/>
-+    <blocker name='minste4'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='deflate'/>
-+    <blocker name='mepochptff'/>
-+    <blocker name='msa13_pckmo'/>
-+    <blocker name='msa13'/>
-+    <blocker name='msa12'/>
-+    <blocker name='msa11_pckmo'/>
-+    <blocker name='msa11'/>
-+    <blocker name='msa10_pckmo'/>
-+    <blocker name='msa10'/>
-+    <blocker name='msa9_pckmo'/>
-+    <blocker name='msa9'/>
-+    <blocker name='msa6'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+    <blocker name='plo_ext'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='tcg' name='qemu' typename='qemu-s390x-cpu' usable='yes'/>
-+  <cpu type='tcg' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z890.3' typename='z890.3-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='gen17b' typename='gen17b-s390x-cpu' usable='no'>
-+    <blocker name='kma-gcm-eaes-256'/>
-+    <blocker name='kma-gcm-eaes-192'/>
-+    <blocker name='kma-gcm-eaes-128'/>
-+    <blocker name='kma-gcm-aes-256'/>
-+    <blocker name='kma-gcm-aes-192'/>
-+    <blocker name='kma-gcm-aes-128'/>
-+    <blocker name='prno-trng-qrtcr'/>
-+    <blocker name='ppno-sha-512-drng'/>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='vxpdeh3'/>
-+    <blocker name='vxeh3'/>
-+    <blocker name='paie'/>
-+    <blocker name='pai'/>
-+    <blocker name='rdp'/>
-+    <blocker name='beareh'/>
-+    <blocker name='vxpdeh2'/>
-+    <blocker name='nnpa'/>
-+    <blocker name='etoken'/>
-+    <blocker name='vxpdeh'/>
-+    <blocker name='mepoch'/>
-+    <blocker name='vxpd'/>
-+    <blocker name='gs'/>
-+    <blocker name='sif'/>
-+    <blocker name='minste4'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='tsi'/>
-+    <blocker name='sema'/>
-+    <blocker name='eec'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='opc'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='deflate'/>
-+    <blocker name='mepochptff'/>
-+    <blocker name='msa13_pckmo'/>
-+    <blocker name='msa13'/>
-+    <blocker name='msa12'/>
-+    <blocker name='msa11_pckmo'/>
-+    <blocker name='msa11'/>
-+    <blocker name='msa10_pckmo'/>
-+    <blocker name='msa10'/>
-+    <blocker name='msa9_pckmo'/>
-+    <blocker name='msa9'/>
-+    <blocker name='msa6'/>
-+    <blocker name='msa1'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+    <blocker name='plo_ext'/>
-+    <blocker name='type'/>
-+  </cpu>
-+  <cpu type='tcg' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z890-base' typename='z890-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z10BC' typename='z10BC-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z9EC' typename='z9EC-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
-+  <cpu type='tcg' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='z13s-base' typename='z13s-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='dfppc'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='csske'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='gen13ptff'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='zBC12' typename='zBC12-s390x-cpu' usable='no'>
-+    <blocker name='pcc-xts-eaes-256'/>
-+    <blocker name='pcc-xts-eaes-128'/>
-+    <blocker name='pcc-xts-aes-256'/>
-+    <blocker name='pcc-xts-aes-128'/>
-+    <blocker name='pcc-cmac-eaes-256'/>
-+    <blocker name='pcc-cmac-eaes-192'/>
-+    <blocker name='pcc-cmac-eaes-128'/>
-+    <blocker name='pcc-cmac-aes-256'/>
-+    <blocker name='pcc-cmac-aes-192'/>
-+    <blocker name='pcc-cmac-aes-128'/>
-+    <blocker name='pcc-cmac-etdea-192'/>
-+    <blocker name='pcc-cmac-etdea-128'/>
-+    <blocker name='pcc-cmac-edea'/>
-+    <blocker name='pcc-cmac-tdea-192'/>
-+    <blocker name='pcc-cmac-tdea-128'/>
-+    <blocker name='pcc-cmac-dea'/>
-+    <blocker name='kmo-eaes-256'/>
-+    <blocker name='kmo-eaes-192'/>
-+    <blocker name='kmo-eaes-128'/>
-+    <blocker name='kmo-aes-256'/>
-+    <blocker name='kmo-aes-192'/>
-+    <blocker name='kmo-aes-128'/>
-+    <blocker name='kmo-etdea-192'/>
-+    <blocker name='kmo-etdea-128'/>
-+    <blocker name='kmo-edea'/>
-+    <blocker name='kmo-tdea-192'/>
-+    <blocker name='kmo-tdea-128'/>
-+    <blocker name='kmo-dea'/>
-+    <blocker name='kmf-eaes-256'/>
-+    <blocker name='kmf-eaes-192'/>
-+    <blocker name='kmf-eaes-128'/>
-+    <blocker name='kmf-aes-256'/>
-+    <blocker name='kmf-aes-192'/>
-+    <blocker name='kmf-aes-128'/>
-+    <blocker name='kmf-etdea-192'/>
-+    <blocker name='kmf-etdea-128'/>
-+    <blocker name='kmf-edea'/>
-+    <blocker name='kmf-tdea-192'/>
-+    <blocker name='kmf-tdea-128'/>
-+    <blocker name='kmf-dea'/>
-+    <blocker name='kmctr-eaes-256'/>
-+    <blocker name='kmctr-eaes-192'/>
-+    <blocker name='kmctr-eaes-128'/>
-+    <blocker name='kmctr-aes-256'/>
-+    <blocker name='kmctr-aes-192'/>
-+    <blocker name='kmctr-aes-128'/>
-+    <blocker name='kmctr-etdea-192'/>
-+    <blocker name='kmctr-etdea-128'/>
-+    <blocker name='kmctr-edea'/>
-+    <blocker name='kmctr-tdea-192'/>
-+    <blocker name='kmctr-tdea-128'/>
-+    <blocker name='kmctr-dea'/>
-+    <blocker name='pckmo-aes-256'/>
-+    <blocker name='pckmo-aes-192'/>
-+    <blocker name='pckmo-aes-128'/>
-+    <blocker name='pckmo-etdea-192'/>
-+    <blocker name='pckmo-etdea-128'/>
-+    <blocker name='pckmo-edea'/>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-ghash'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-xts-eaes-256'/>
-+    <blocker name='km-xts-eaes-128'/>
-+    <blocker name='km-xts-aes-256'/>
-+    <blocker name='km-xts-aes-128'/>
-+    <blocker name='km-eaes-256'/>
-+    <blocker name='km-eaes-192'/>
-+    <blocker name='km-eaes-128'/>
-+    <blocker name='km-aes-256'/>
-+    <blocker name='km-aes-192'/>
-+    <blocker name='km-etdea-192'/>
-+    <blocker name='km-etdea-128'/>
-+    <blocker name='km-edea'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-prng'/>
-+    <blocker name='kmc-eaes-256'/>
-+    <blocker name='kmc-eaes-192'/>
-+    <blocker name='kmc-eaes-128'/>
-+    <blocker name='kmc-aes-256'/>
-+    <blocker name='kmc-aes-192'/>
-+    <blocker name='kmc-etdea-192'/>
-+    <blocker name='kmc-etdea-128'/>
-+    <blocker name='kmc-edea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-eaes-256'/>
-+    <blocker name='kmac-eaes-192'/>
-+    <blocker name='kmac-eaes-128'/>
-+    <blocker name='kmac-aes-256'/>
-+    <blocker name='kmac-aes-192'/>
-+    <blocker name='kmac-aes-128'/>
-+    <blocker name='kmac-etdea-192'/>
-+    <blocker name='kmac-etdea-128'/>
-+    <blocker name='kmac-edea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='bpb'/>
-+    <blocker name='ppa15'/>
-+    <blocker name='edat2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='te'/>
-+    <blocker name='ri'/>
-+    <blocker name='cte'/>
-+    <blocker name='dfpzc'/>
-+    <blocker name='cmpsceh'/>
-+    <blocker name='pfpo'/>
-+    <blocker name='dfphp'/>
-+    <blocker name='dfp'/>
-+    <blocker name='emon'/>
-+    <blocker name='parseh'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='nonqks'/>
-+    <blocker name='ipter'/>
-+    <blocker name='csske'/>
-+    <blocker name='edat'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <cpu type='tcg' name='z990-base' typename='z990-base-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='hfpm'/>
-+  </cpu>
-+  <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'>
-+    <blocker name='klmd-sha-1'/>
-+    <blocker name='kimd-sha-1'/>
-+    <blocker name='km-tdea-192'/>
-+    <blocker name='km-tdea-128'/>
-+    <blocker name='km-dea'/>
-+    <blocker name='kmc-tdea-192'/>
-+    <blocker name='kmc-tdea-128'/>
-+    <blocker name='kmc-dea'/>
-+    <blocker name='kmac-tdea-192'/>
-+    <blocker name='kmac-tdea-128'/>
-+    <blocker name='kmac-dea'/>
-+    <blocker name='cmm'/>
-+    <blocker name='dateh2'/>
-+    <blocker name='sthyi'/>
-+    <blocker name='hfpue'/>
-+    <blocker name='hfpm'/>
-+    <blocker name='asnlxr'/>
-+    <blocker name='msa1'/>
-+    <blocker name='tods'/>
-+  </cpu>
-+  <machine type='tcg' name='s390-ccw-virtio-10.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-8.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-6.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-7.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-5.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-9.2' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-4.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-8.2' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-6.2' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-7.2' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='tcg' name='x-remote' maxCpus='1' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-5.2' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-4.2' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-9.1' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-8.1' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-6.1' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-7.1' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-5.1' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-4.1' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' deprecated='yes' acpi='no'/>
-+  <machine type='tcg' name='s390-ccw-virtio-9.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu' defaultRAMid='s390.ram' acpi='no'/>
-+</qemuCaps>
--- 
-2.49.0
diff --git a/SOURCES/libvirt-tests-properly-mock-VFIO-and-IOMMU-checks.patch b/SOURCES/libvirt-tests-properly-mock-VFIO-and-IOMMU-checks.patch
new file mode 100644
index 0000000..ed57d60
--- /dev/null
+++ b/SOURCES/libvirt-tests-properly-mock-VFIO-and-IOMMU-checks.patch
@@ -0,0 +1,113 @@
+From 2d5bf873ca8aad6e2e0a151a427bbfdb6d93c766 Mon Sep 17 00:00:00 2001
+Message-ID: <2d5bf873ca8aad6e2e0a151a427bbfdb6d93c766.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Mon, 16 Feb 2026 16:53:57 +0100
+Subject: [PATCH] tests: properly mock VFIO and IOMMU checks
+
+Fixes: 63434db800b921e96fec424a667b7161af1f02de
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 75db232f90af2b2acd95266dd21290c967e3c625)
+
+Resolves: https://issues.redhat.com/browse/RHEL-138544
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/util/virutil.h                                  |  2 +-
+ tests/domaincapsdata/qemu_9.0.0.sparc.xml           |  5 +----
+ tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml |  5 +----
+ tests/domaincapsmock.c                              | 10 ++++++++++
+ tests/domaincapstest.c                              |  8 --------
+ 5 files changed, 13 insertions(+), 17 deletions(-)
+
+diff --git a/src/util/virutil.h b/src/util/virutil.h
+index ca6fd95363..7e1705e7ce 100644
+--- a/src/util/virutil.h
++++ b/src/util/virutil.h
+@@ -141,7 +141,7 @@ unsigned long long virMemoryLimitTruncate(unsigned long long value);
+ bool virMemoryLimitIsSet(unsigned long long value);
+ unsigned long long virMemoryMaxValue(bool ulong) ATTRIBUTE_MOCKABLE;
+ 
+-bool virHostHasIOMMU(void);
++bool virHostHasIOMMU(void) ATTRIBUTE_MOCKABLE;
+ 
+ char *virHostGetDRMRenderNode(void) ATTRIBUTE_MOCKABLE;
+ 
+diff --git a/tests/domaincapsdata/qemu_9.0.0.sparc.xml b/tests/domaincapsdata/qemu_9.0.0.sparc.xml
+index 062e55718b..93d8d40c2c 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.sparc.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.sparc.xml
+@@ -86,10 +86,7 @@
+         <value>scsi</value>
+       </enum>
+       <enum name='capsType'/>
+-      <enum name='pciBackend'>
+-        <value>default</value>
+-        <value>vfio</value>
+-      </enum>
++      <enum name='pciBackend'/>
+       <enum name='iommufd'>
+         <value>no</value>
+       </enum>
+diff --git a/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml b/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml
+index db51e7b120..a65d9d36fd 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml
+@@ -147,10 +147,7 @@
+         <value>scsi</value>
+       </enum>
+       <enum name='capsType'/>
+-      <enum name='pciBackend'>
+-        <value>default</value>
+-        <value>vfio</value>
+-      </enum>
++      <enum name='pciBackend'/>
+       <enum name='iommufd'>
+         <value>no</value>
+       </enum>
+diff --git a/tests/domaincapsmock.c b/tests/domaincapsmock.c
+index 370ce35709..aa13deb324 100644
+--- a/tests/domaincapsmock.c
++++ b/tests/domaincapsmock.c
+@@ -21,6 +21,7 @@
+ #include "virhostmem.h"
+ #include "viriommufd.h"
+ #include "virmock.h"
++#include "virutil.h"
+ 
+ #if WITH_QEMU
+ # include "qemu/qemu_capabilities.h"
+@@ -91,5 +92,14 @@ virFileExists(const char *path)
+     if (STREQ(path, VIR_IOMMU_DEV_PATH))
+         return true;
+ 
++    if (STREQ(path, "/dev/vfio/vfio"))
++        return true;
++
+     return real_virFileExists(path);
+ }
++
++bool
++virHostHasIOMMU(void)
++{
++    return true;
++}
+diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
+index 71e181d179..5b2fc80f0a 100644
+--- a/tests/domaincapstest.c
++++ b/tests/domaincapstest.c
+@@ -104,14 +104,6 @@ fillQemuCaps(virDomainCaps *domCaps,
+                                   false) < 0)
+         return -1;
+ 
+-    /* The function above tries to query host's VFIO capabilities by calling
+-     * virHostdevHostSupportsPassthroughVFIO() which, however, can't be
+-     * successfully mocked as they are not exposed as internal APIs. Therefore,
+-     * instead of mocking set the expected values here by hand. */
+-    VIR_DOMAIN_CAPS_ENUM_SET(domCaps->hostdev.pciBackend,
+-                             VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT,
+-                             VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO);
+-
+     /* As of f05b6a918e28 we are expecting to see OVMF_CODE.fd file which
+      * may not exists everywhere. */
+     while (loader->values.nvalues)
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-tests-qemuxmlconfdata-provide-iommufd-sample-XML-and-CLI-args.patch b/SOURCES/libvirt-tests-qemuxmlconfdata-provide-iommufd-sample-XML-and-CLI-args.patch
new file mode 100644
index 0000000..7175d3e
--- /dev/null
+++ b/SOURCES/libvirt-tests-qemuxmlconfdata-provide-iommufd-sample-XML-and-CLI-args.patch
@@ -0,0 +1,634 @@
+From 80a13b6c03b18d766fdfe951bc063f2e9ed25820 Mon Sep 17 00:00:00 2001
+Message-ID: <80a13b6c03b18d766fdfe951bc063f2e9ed25820.1770383237.git.jdenemar@redhat.com>
+From: Nathan Chen <nathanc@nvidia.com>
+Date: Fri, 30 Jan 2026 10:59:18 -0800
+Subject: [PATCH] tests: qemuxmlconfdata: provide iommufd sample XML and CLI
+ args
+
+Provide sample XML and CLI args for the iommufd XML schema
+for pc, q35, and virt machine types.
+
+Signed-off-by: Nathan Chen <nathanc@nvidia.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 74fc02d792f7ee55d2e0a7b9ad4e6d751c36ceb8)
+
+Resolves: https://issues.redhat.com/browse/RHEL-126345
+
+Conflicts:
+    - missing upstream commit 5b080bc5801ea2b15296d3f89be75a0882b317c2
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ .../iommufd-q35.x86_64-latest.args            | 41 +++++++++++++
+ .../iommufd-q35.x86_64-latest.xml             | 60 +++++++++++++++++++
+ tests/qemuxmlconfdata/iommufd-q35.xml         | 38 ++++++++++++
+ ...fd-virt-pci-bus-single.aarch64-latest.args | 33 ++++++++++
+ ...ufd-virt-pci-bus-single.aarch64-latest.xml | 34 +++++++++++
+ .../iommufd-virt-pci-bus-single.xml           | 22 +++++++
+ .../iommufd-virt.aarch64-latest.args          | 37 ++++++++++++
+ .../iommufd-virt.aarch64-latest.xml           | 56 +++++++++++++++++
+ tests/qemuxmlconfdata/iommufd-virt.xml        | 29 +++++++++
+ .../iommufd.x86_64-latest.args                | 35 +++++++++++
+ .../qemuxmlconfdata/iommufd.x86_64-latest.xml | 38 ++++++++++++
+ tests/qemuxmlconfdata/iommufd.xml             | 30 ++++++++++
+ tests/qemuxmlconftest.c                       | 34 +++++++++++
+ 13 files changed, 487 insertions(+)
+ create mode 100644 tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
+ create mode 100644 tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.xml
+ create mode 100644 tests/qemuxmlconfdata/iommufd-q35.xml
+ create mode 100644 tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
+ create mode 100644 tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.xml
+ create mode 100644 tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.xml
+ create mode 100644 tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
+ create mode 100644 tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.xml
+ create mode 100644 tests/qemuxmlconfdata/iommufd-virt.xml
+ create mode 100644 tests/qemuxmlconfdata/iommufd.x86_64-latest.args
+ create mode 100644 tests/qemuxmlconfdata/iommufd.x86_64-latest.xml
+ create mode 100644 tests/qemuxmlconfdata/iommufd.xml
+
+diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
+new file mode 100644
+index 0000000000..7d819e141b
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
+@@ -0,0 +1,41 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/var/lib/libvirt/qemu/domain--1-q35-test \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.local/share \
++XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.cache \
++XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
++/usr/bin/qemu-system-x86_64 \
++-name guest=q35-test,debug-threads=on \
++-S \
++-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \
++-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
++-accel tcg \
++-cpu qemu64 \
++-m size=2097152k \
++-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \
++-overcommit mem-lock=off \
++-smp 2,sockets=2,cores=1,threads=1 \
++-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-boot strict=on \
++-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \
++-device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \
++-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
++-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \
++-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id":"sata0-0-0","bootindex":1}' \
++-audiodev '{"id":"audio1","driver":"none"}' \
++-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \
++-global ICH9-LPC.noreboot=off \
++-watchdog-action reset \
++-object '{"qom-type":"iommufd","id":"iommufd0","fd":"-1"}' \
++-device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x3"}' \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.xml
+new file mode 100644
+index 0000000000..bb76252b61
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.xml
+@@ -0,0 +1,60 @@
++<domain type='qemu'>
++  <name>q35-test</name>
++  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
++  <memory unit='KiB'>2097152</memory>
++  <currentMemory unit='KiB'>2097152</currentMemory>
++  <vcpu placement='static' cpuset='0-1'>2</vcpu>
++  <os>
++    <type arch='x86_64' machine='q35'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='custom' match='exact' check='none'>
++    <model fallback='forbid'>qemu64</model>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++    <emulator>/usr/bin/qemu-system-x86_64</emulator>
++    <disk type='block' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source dev='/dev/HostVG/QEMUGuest1'/>
++      <target dev='sda' bus='sata'/>
++      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
++    </disk>
++    <controller type='pci' index='0' model='pcie-root'/>
++    <controller type='pci' index='1' model='pcie-root-port'>
++      <model name='pcie-root-port'/>
++      <target chassis='1' port='0x10'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
++    </controller>
++    <controller type='pci' index='2' model='pcie-root-port'>
++      <model name='pcie-root-port'/>
++      <target chassis='2' port='0x11'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
++    </controller>
++    <controller type='sata' index='0'>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
++    </controller>
++    <controller type='usb' index='0' model='qemu-xhci'>
++      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
++    </controller>
++    <input type='mouse' bus='ps2'/>
++    <input type='keyboard' bus='ps2'/>
++    <audio id='1' type='none'/>
++    <video>
++      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
++    </video>
++    <hostdev mode='subsystem' type='pci' managed='yes'>
++      <driver iommufd='yes'/>
++      <source>
++        <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
++      </source>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
++    </hostdev>
++    <watchdog model='itco' action='reset'/>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxmlconfdata/iommufd-q35.xml b/tests/qemuxmlconfdata/iommufd-q35.xml
+new file mode 100644
+index 0000000000..f3c2269fb1
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd-q35.xml
+@@ -0,0 +1,38 @@
++<domain type='qemu'>
++  <name>q35-test</name>
++  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
++  <memory unit='KiB'>2097152</memory>
++  <currentMemory unit='KiB'>2097152</currentMemory>
++  <vcpu placement='static' cpuset='0-1'>2</vcpu>
++  <os>
++    <type arch='x86_64' machine='q35'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++    <emulator>/usr/bin/qemu-system-x86_64</emulator>
++    <disk type='block' device='disk'>
++      <source dev='/dev/HostVG/QEMUGuest1'/>
++      <target dev='sda' bus='sata'/>
++      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
++    </disk>
++    <controller type='pci' index='0' model='pcie-root'/>
++    <hostdev mode='subsystem' type='pci' managed='yes'>
++      <driver iommufd='yes'/>
++      <source>
++        <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
++      </source>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
++    </hostdev>
++    <controller type='sata' index='0'/>
++    <input type='mouse' bus='ps2'/>
++    <input type='keyboard' bus='ps2'/>
++    <video>
++      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
++    </video>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
+new file mode 100644
+index 0000000000..dbfd395168
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
+@@ -0,0 +1,33 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/var/lib/libvirt/qemu/domain--1-foo \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-foo/.local/share \
++XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-foo/.cache \
++XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
++/usr/bin/qemu-system-aarch64 \
++-name guest=foo,debug-threads=on \
++-S \
++-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \
++-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \
++-accel tcg \
++-cpu cortex-a15 \
++-m size=1048576k \
++-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
++-overcommit mem-lock=off \
++-smp 1,sockets=1,cores=1,threads=1 \
++-uuid 6ba7b810-9dad-11d1-80b4-00c04fd430c8 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-boot strict=on \
++-audiodev '{"id":"audio1","driver":"none"}' \
++-object '{"qom-type":"iommufd","id":"iommufd0","fd":"-1"}' \
++-device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x1"}' \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.xml b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.xml
+new file mode 100644
+index 0000000000..97b6e1e1c7
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.xml
+@@ -0,0 +1,34 @@
++<domain type='qemu'>
++  <name>foo</name>
++  <uuid>6ba7b810-9dad-11d1-80b4-00c04fd430c8</uuid>
++  <memory unit='KiB'>1048576</memory>
++  <currentMemory unit='KiB'>1048576</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='aarch64' machine='virt'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <features>
++    <gic version='2'/>
++  </features>
++  <cpu mode='custom' match='exact' check='none'>
++    <model fallback='forbid'>cortex-a15</model>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++    <emulator>/usr/bin/qemu-system-aarch64</emulator>
++    <controller type='pci' index='0' model='pcie-root'/>
++    <audio id='1' type='none'/>
++    <hostdev mode='subsystem' type='pci' managed='yes'>
++      <driver iommufd='yes'/>
++      <source>
++        <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
++      </source>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
++    </hostdev>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.xml b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.xml
+new file mode 100644
+index 0000000000..c0b9d643b4
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.xml
+@@ -0,0 +1,22 @@
++<domain type='qemu'>
++  <name>foo</name>
++  <uuid>6ba7b810-9dad-11d1-80b4-00c04fd430c8</uuid>
++  <memory unit='KiB'>1048576</memory>
++  <currentMemory unit='KiB'>1048576</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='aarch64' machine='virt'>hvm</type>
++  </os>
++  <devices>
++    <emulator>/usr/bin/qemu-system-aarch64</emulator>
++    <controller type='pci' index='0' model='pcie-root'/>
++    <hostdev mode='subsystem' type='pci' managed='yes'>
++      <driver iommufd='yes'/>
++      <source>
++        <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
++      </source>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
++    </hostdev>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
+new file mode 100644
+index 0000000000..d5713ff826
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
+@@ -0,0 +1,37 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/var/lib/libvirt/qemu/domain--1-foo \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-foo/.local/share \
++XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-foo/.cache \
++XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
++/usr/bin/qemu-system-aarch64 \
++-name guest=foo,debug-threads=on \
++-S \
++-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \
++-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \
++-accel tcg \
++-cpu cortex-a15 \
++-m size=1048576k \
++-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
++-overcommit mem-lock=off \
++-smp 1,sockets=1,cores=1,threads=1 \
++-uuid 6ba7b810-9dad-11d1-80b4-00c04fd430c8 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-boot strict=on \
++-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
++-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
++-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \
++-audiodev '{"id":"audio1","driver":"none"}' \
++-object '{"qom-type":"iommufd","id":"iommufd0","fd":"-1"}' \
++-device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.1","addr":"0x0"}' \
++-device '{"driver":"vfio-pci","host":"0000:07:12.5","id":"hostdev1","iommufd":"iommufd0","fd":"0","bus":"pci.2","addr":"0x0"}' \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.xml b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.xml
+new file mode 100644
+index 0000000000..6b9fe543b3
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.xml
+@@ -0,0 +1,56 @@
++<domain type='qemu'>
++  <name>foo</name>
++  <uuid>6ba7b810-9dad-11d1-80b4-00c04fd430c8</uuid>
++  <memory unit='KiB'>1048576</memory>
++  <currentMemory unit='KiB'>1048576</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='aarch64' machine='virt'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <features>
++    <gic version='2'/>
++  </features>
++  <cpu mode='custom' match='exact' check='none'>
++    <model fallback='forbid'>cortex-a15</model>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++    <emulator>/usr/bin/qemu-system-aarch64</emulator>
++    <controller type='pci' index='0' model='pcie-root'/>
++    <controller type='pci' index='1' model='pcie-root-port'>
++      <model name='pcie-root-port'/>
++      <target chassis='1' port='0x8'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
++    </controller>
++    <controller type='pci' index='2' model='pcie-root-port'>
++      <model name='pcie-root-port'/>
++      <target chassis='2' port='0x9'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
++    </controller>
++    <controller type='pci' index='3' model='pcie-root-port'>
++      <model name='pcie-root-port'/>
++      <target chassis='3' port='0xa'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
++    </controller>
++    <audio id='1' type='none'/>
++    <hostdev mode='subsystem' type='pci' managed='yes'>
++      <driver iommufd='yes'/>
++      <source>
++        <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
++      </source>
++      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
++    </hostdev>
++    <hostdev mode='subsystem' type='pci' managed='yes'>
++      <driver iommufd='yes'/>
++      <source>
++        <address domain='0x0000' bus='0x07' slot='0x12' function='0x5'/>
++      </source>
++      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
++    </hostdev>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxmlconfdata/iommufd-virt.xml b/tests/qemuxmlconfdata/iommufd-virt.xml
+new file mode 100644
+index 0000000000..a75c1cc13b
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd-virt.xml
+@@ -0,0 +1,29 @@
++<domain type='qemu'>
++  <name>foo</name>
++  <uuid>6ba7b810-9dad-11d1-80b4-00c04fd430c8</uuid>
++  <memory unit='KiB'>1048576</memory>
++  <currentMemory unit='KiB'>1048576</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='aarch64' machine='virt'>hvm</type>
++  </os>
++  <devices>
++    <emulator>/usr/bin/qemu-system-aarch64</emulator>
++    <controller type='pci' index='0' model='pcie-root'/>
++    <hostdev mode='subsystem' type='pci' managed='yes'>
++      <driver iommufd='yes'/>
++      <source>
++        <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
++      </source>
++      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
++    </hostdev>
++    <hostdev mode='subsystem' type='pci' managed='yes'>
++      <driver iommufd='yes'/>
++      <source>
++        <address domain='0x0000' bus='0x07' slot='0x12' function='0x5'/>
++      </source>
++      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
++    </hostdev>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
+new file mode 100644
+index 0000000000..3130ba2e3a
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
+@@ -0,0 +1,35 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/var/lib/libvirt/qemu/domain--1-foo \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-foo/.local/share \
++XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-foo/.cache \
++XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
++/usr/bin/qemu-system-x86_64 \
++-name guest=foo,debug-threads=on \
++-S \
++-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \
++-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
++-accel tcg \
++-cpu qemu64 \
++-m size=2097152k \
++-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \
++-overcommit mem-lock=off \
++-smp 2,sockets=2,cores=1,threads=1 \
++-uuid 3c7c30b5-7866-4b05-8a29-efebccba52a0 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-boot strict=on \
++-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
++-audiodev '{"id":"audio1","driver":"none"}' \
++-object '{"qom-type":"iommufd","id":"iommufd0","fd":"-1"}' \
++-device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.0","addr":"0x3"}' \
++-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.xml b/tests/qemuxmlconfdata/iommufd.x86_64-latest.xml
+new file mode 100644
+index 0000000000..2e8951aaf6
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.xml
+@@ -0,0 +1,38 @@
++<domain type='qemu'>
++  <name>foo</name>
++  <uuid>3c7c30b5-7866-4b05-8a29-efebccba52a0</uuid>
++  <memory unit='KiB'>2097152</memory>
++  <currentMemory unit='KiB'>2097152</currentMemory>
++  <vcpu placement='static' cpuset='0-1'>2</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='custom' match='exact' check='none'>
++    <model fallback='forbid'>qemu64</model>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++    <emulator>/usr/bin/qemu-system-x86_64</emulator>
++    <controller type='pci' index='0' model='pci-root'/>
++    <controller type='usb' index='0' model='piix3-uhci'>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
++    </controller>
++    <input type='mouse' bus='ps2'/>
++    <input type='keyboard' bus='ps2'/>
++    <audio id='1' type='none'/>
++    <hostdev mode='subsystem' type='pci' managed='yes'>
++      <driver iommufd='yes'/>
++      <source>
++        <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
++      </source>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
++    </hostdev>
++    <memballoon model='virtio'>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
++    </memballoon>
++  </devices>
++</domain>
+diff --git a/tests/qemuxmlconfdata/iommufd.xml b/tests/qemuxmlconfdata/iommufd.xml
+new file mode 100644
+index 0000000000..eb278414d2
+--- /dev/null
++++ b/tests/qemuxmlconfdata/iommufd.xml
+@@ -0,0 +1,30 @@
++<domain type='qemu'>
++  <name>foo</name>
++  <uuid>3c7c30b5-7866-4b05-8a29-efebccba52a0</uuid>
++  <memory unit='KiB'>2097152</memory>
++  <currentMemory unit='KiB'>2097152</currentMemory>
++  <vcpu placement='static' cpuset='0-1'>2</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++    <emulator>/usr/bin/qemu-system-x86_64</emulator>
++    <controller type='pci' index='0' model='pci-root'/>
++    <hostdev mode='subsystem' type='pci' managed='yes'>
++      <driver iommufd='yes'/>
++      <source>
++        <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
++      </source>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
++    </hostdev>
++    <controller type='usb' index='0'/>
++    <input type='mouse' bus='ps2'/>
++    <input type='keyboard' bus='ps2'/>
++    <memballoon model='virtio'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
+index de03c58c8a..27e63cff24 100644
+--- a/tests/qemuxmlconftest.c
++++ b/tests/qemuxmlconftest.c
+@@ -351,6 +351,33 @@ fakeNetworkPortGetXMLDesc(virNetworkPortPtr port,
+ }
+ 
+ 
++static void
++testSetupHostdevPrivateData(virDomainDef *def)
++{
++    size_t i;
++
++    for (i = 0; i < def->nhostdevs; i++) {
++        virDomainHostdevDef *hostdev = def->hostdevs[i];
++
++        if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
++            hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
++            hostdev->source.subsys.u.pci.driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO &&
++            hostdev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES) {
++
++            qemuDomainHostdevPrivate *priv;
++
++            if (!hostdev->privateData) {
++                hostdev->privateData = qemuDomainHostdevPrivateNew();
++            }
++
++            priv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
++            /* Use a placeholder FD value for tests */
++            priv->vfioDeviceFd = 0;
++        }
++    }
++}
++
++
+ static virNetworkDriver fakeNetworkDriver = {
+     .networkLookupByName = fakeNetworkLookupByName,
+     .networkGetXMLDesc = fakeNetworkGetXMLDesc,
+@@ -404,6 +431,8 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
+     if (testQemuPrepareHostBackendChardevOne(NULL, priv->monConfig, vm) < 0)
+         return NULL;
+ 
++    testSetupHostdevPrivateData(vm->def);
++
+     for (i = 0; i < vm->def->ndisks; i++) {
+         virDomainDiskDef *disk = vm->def->disks[i];
+         virStorageSource *src;
+@@ -3048,6 +3077,11 @@ mymain(void)
+     DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-iommu-dma-translation");
+     DO_TEST_CAPS_LATEST("acpi-generic-initiator");
+ 
++    DO_TEST_CAPS_LATEST("iommufd");
++    DO_TEST_CAPS_LATEST("iommufd-q35");
++    DO_TEST_CAPS_ARCH_LATEST("iommufd-virt", "aarch64");
++    DO_TEST_CAPS_ARCH_LATEST("iommufd-virt-pci-bus-single", "aarch64");
++
+     DO_TEST_CAPS_LATEST("cpu-hotplug-startup");
+     DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("cpu-hotplug-granularity", "ppc64");
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-tools-ssh-proxy-Check-for-domain-status-before-parsing-its-CID.patch b/SOURCES/libvirt-tools-ssh-proxy-Check-for-domain-status-before-parsing-its-CID.patch
deleted file mode 100644
index 059e770..0000000
--- a/SOURCES/libvirt-tools-ssh-proxy-Check-for-domain-status-before-parsing-its-CID.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2eab8ef9338a884b491d198bf2c6a51e271f2170 Mon Sep 17 00:00:00 2001
-Message-ID: <2eab8ef9338a884b491d198bf2c6a51e271f2170.1737731143.git.jdenemar@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 21 Jan 2025 12:36:48 +0100
-Subject: [PATCH] tools: ssh-proxy: Check for domain status before parsing its
- CID
-
-Inactive domain XML can be wildly different to the live XML. For
-instance, it can have VSOCK CID of that from another (running)
-domain. Since domain status is not checked for, attempting to ssh
-into an inactive domain may in fact result in opening a
-connection to a different live domain that listens on said CID
-currently.
-
-Resolves: https://gitlab.com/libvirt/libvirt/-/issues/737
-Resolves: https://issues.redhat.com/browse/RHEL-75577
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit ab10c0695d142c78d1ea078b553e1c035e7abc8a)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- tools/ssh-proxy/ssh-proxy.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tools/ssh-proxy/ssh-proxy.c b/tools/ssh-proxy/ssh-proxy.c
-index e60c58d57f..22daffeb63 100644
---- a/tools/ssh-proxy/ssh-proxy.c
-+++ b/tools/ssh-proxy/ssh-proxy.c
-@@ -194,7 +194,10 @@ lookupDomainAndFetchCID(const char *uri,
-         if (virStrToLong_i(domname, NULL, 10, &id) >= 0)
-             dom = virDomainLookupByID(conn, id);
-     }
--    if (!dom)
-+
-+    /* If no domain is found, return an error. Similarly, inactive domain may
-+     * contain CID of another (running) domain, yielding misleading results. */
-+    if (!dom || virDomainIsActive(dom) <= 0)
-         return -1;
- 
-     return extractCID(dom, cid);
--- 
-2.48.1
diff --git a/SOURCES/libvirt-util-Fix-race-condition-in-virFileIsSharedFSOverride.patch b/SOURCES/libvirt-util-Fix-race-condition-in-virFileIsSharedFSOverride.patch
new file mode 100644
index 0000000..f826270
--- /dev/null
+++ b/SOURCES/libvirt-util-Fix-race-condition-in-virFileIsSharedFSOverride.patch
@@ -0,0 +1,114 @@
+From 7f7d60e42f39deaec69318b93cf922f1dda54a26 Mon Sep 17 00:00:00 2001
+Message-ID: <7f7d60e42f39deaec69318b93cf922f1dda54a26.1766070256.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 5 Dec 2025 16:51:25 +0100
+Subject: [PATCH] util: Fix race condition in virFileIsSharedFSOverride
+
+Switch virFileIsSharedFSOverride to use virFileCheckParents to avoid a
+race which could result in virFileCanonicalizePath to be called on a
+path that does not exist anymore.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 3a44f0c23d75519a9a374f790f4b91ab7b65a138)
+
+https://issues.redhat.com/browse/RHEL-135287
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/util/virfile.c | 59 +++++++++++++++++-----------------------------
+ 1 file changed, 22 insertions(+), 37 deletions(-)
+
+diff --git a/src/util/virfile.c b/src/util/virfile.c
+index 95fc8ff0e6..52d711d2a9 100644
+--- a/src/util/virfile.c
++++ b/src/util/virfile.c
+@@ -3502,33 +3502,6 @@ virFileCheckParents(const char *path,
+ }
+ 
+ 
+-static char *
+-virFileGetExistingParent(const char *path)
+-{
+-    g_autofree char *dirpath = g_strdup(path);
+-    char *p = NULL;
+-
+-    /* Try less and less of the path until we get to a directory we can access.
+-     * Even if we don't have 'x' permission on any directory in the path on the
+-     * NFS server (assuming it's NFS), we will be able to stat the mount point.
+-     */
+-    while (!virFileExists(dirpath) && p != dirpath) {
+-        if (!(p = strrchr(dirpath, '/'))) {
+-            virReportSystemError(EINVAL,
+-                                 _("Invalid relative path '%1$s'"), path);
+-            return NULL;
+-        }
+-
+-        if (p == dirpath)
+-            *(p + 1) = '\0';
+-        else
+-            *p = '\0';
+-    }
+-
+-    return g_steal_pointer(&dirpath);
+-}
+-
+-
+ #ifdef __linux__
+ 
+ # ifndef NFS_SUPER_MAGIC
+@@ -3875,6 +3848,17 @@ virFileGetDefaultHugepage(virHugeTLBFS *fs,
+ }
+ 
+ 
++static bool
++virFileCheckParentsCanonicalize(const char *path,
++                                void *opaque)
++{
++    char **canonical = opaque;
++
++    *canonical = virFileCanonicalizePath(path);
++    return !!*canonical;
++}
++
++
+ /**
+  * virFileIsSharedFSOverride:
+  * @path: Path to check
+@@ -3888,24 +3872,25 @@ virFileIsSharedFSOverride(const char *path,
+                           char *const *overrides)
+ {
+     g_autofree char *dirpath = NULL;
+-    g_autofree char *existing = NULL;
+     char *p = NULL;
++    int rc;
+ 
+     if (!path || path[0] != '/' || !overrides)
+         return false;
+ 
+     /* We only care about the longest existing sub-path. Further components
+-     * may will later be created by libvirt will not magically become a shared
+-     * filesystem. */
+-    if (!(existing = virFileGetExistingParent(path)))
++     * that may later be created by libvirt will not magically become a shared
++     * filesystem. Overrides have been canonicalized ahead of time, so we need
++     * to do the same for the provided path or we'll never be able to find a
++     * match if symlinks are involved.
++     */
++    rc = virFileCheckParents(path, NULL,
++                             virFileCheckParentsCanonicalize, &dirpath);
++    if (rc == -1)
+         return false;
+ 
+-    /* Overrides have been canonicalized ahead of time, so we need to
+-     * do the same for the provided path or we'll never be able to
+-     * find a match if symlinks are involved */
+-    if (!(dirpath = virFileCanonicalizePath(existing))) {
+-        VIR_DEBUG("Cannot canonicalize parent '%s' of path '%s'",
+-                  existing, path);
++    if (rc != 0) {
++        VIR_DEBUG("Cannot canonicalize path '%s'", path);
+         return false;
+     }
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-util-Fix-race-condition-in-virFileIsSharedFSType.patch b/SOURCES/libvirt-util-Fix-race-condition-in-virFileIsSharedFSType.patch
new file mode 100644
index 0000000..9ba7572
--- /dev/null
+++ b/SOURCES/libvirt-util-Fix-race-condition-in-virFileIsSharedFSType.patch
@@ -0,0 +1,144 @@
+From 4596ee4c2fe33d3b44a44b120d61052ac943bae4 Mon Sep 17 00:00:00 2001
+Message-ID: <4596ee4c2fe33d3b44a44b120d61052ac943bae4.1766070256.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 5 Dec 2025 16:47:14 +0100
+Subject: [PATCH] util: Fix race condition in virFileIsSharedFSType
+
+virFileIsSharedFSType could end up calling statfs on a path that no
+longer exists and return an error. If this happens for a path on a
+shared filesystem, the caller may incorrectly consider the path as
+non-shared.
+
+Specifically, when starting a domain with TPM enabled and deciding
+whether its vTPM state is stored on a shared storage, the race could
+cause qemuTPMEmulatorBuildCommand to consider the state to be
+non-shared. This means swtpm would be started without --migration even
+when the state is actually stored on a shared storage and any attempt to
+migrate such domain would fail with
+
+    Operation not supported: the running swtpm does not support
+    migration with shared storage
+
+In fact, any caller of virFileGetExistingParent contained an inherent
+TOCTOU race condition as the existing parent of a given path return by
+virFileGetExistingParent may no longer exist at the time the caller
+wants to check it.
+
+This patch introduces a new virFileCheckParents API which is almost
+identical to virFileGetExistingParent, but uses a supplied callback to
+check each path. This new API is used in virFileIsSharedFSType to avoid
+the race. The old function will later be completely removed once all
+callers are switched to the new one.
+
+Fixes: 05526b50909ff50c16e13a0b5580d41de74e3d59
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit b6addd42bece693debbf2e95551a2b4d2e1b453f)
+
+https://issues.redhat.com/browse/RHEL-135287
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/util/virfile.c | 71 ++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 69 insertions(+), 2 deletions(-)
+
+diff --git a/src/util/virfile.c b/src/util/virfile.c
+index a5c9fbe0d9..95fc8ff0e6 100644
+--- a/src/util/virfile.c
++++ b/src/util/virfile.c
+@@ -3445,6 +3445,63 @@ virFileRemoveLastComponent(char *path)
+ }
+ 
+ 
++/* Check callback for virFileCheckParents */
++typedef bool (*virFileCheckParentsCallback)(const char *dirpath,
++                                            void *opaque);
++
++/**
++ * virFileCheckParents:
++ * @path: path to check
++ * @parent: where to store the closest parent satisfying the check
++ * @check: callback called on parent paths
++ * @opaque: data for the @check callback
++ *
++ * Calls @check on the @path and its parent paths until it returns true or a
++ * root directory is reached. When @check returns true, the @parent (if
++ * non-NULL) will be set to a copy of the corresponding path. The caller is
++ * responsible for freeing it.
++ *
++ * Returns  0 on success (@parent set),
++ *         -1 on invalid input,
++ *         -2 when no path (including "/") satisfies the @check.
++ */
++static int
++virFileCheckParents(const char *path,
++                    char **parent,
++                    virFileCheckParentsCallback check,
++                    void *opaque)
++{
++    g_autofree char *dirpath = g_strdup(path);
++    char *p = NULL;
++    bool checkOK;
++
++    checkOK = check(dirpath, opaque);
++
++    while (!checkOK && p != dirpath) {
++        if (!(p = strrchr(dirpath, G_DIR_SEPARATOR))) {
++            virReportSystemError(EINVAL,
++                                 _("Invalid absolute path '%1$s'"), path);
++            return -1;
++        }
++
++        if (p == dirpath)
++            *(p + 1) = '\0';
++        else
++            *p = '\0';
++
++        checkOK = check(dirpath, opaque);
++    }
++
++    if (!checkOK)
++        return -2;
++
++    if (parent)
++        *parent = g_steal_pointer(&dirpath);
++
++    return 0;
++}
++
++
+ static char *
+ virFileGetExistingParent(const char *path)
+ {
+@@ -3599,6 +3656,14 @@ static const struct virFileSharedFsData virFileSharedFs[] = {
+ };
+ 
+ 
++static bool
++virFileCheckParentsStatFS(const char *path,
++                          void *opaque)
++{
++    return statfs(path, (struct statfs *) opaque) == 0;
++}
++
++
+ int
+ virFileIsSharedFSType(const char *path,
+                       unsigned int fstypes)
+@@ -3607,11 +3672,13 @@ virFileIsSharedFSType(const char *path,
+     struct statfs sb;
+     long long f_type = 0;
+     size_t i;
++    int rc;
+ 
+-    if (!(dirpath = virFileGetExistingParent(path)))
++    if ((rc = virFileCheckParents(path, &dirpath,
++                                  virFileCheckParentsStatFS, &sb)) == -1)
+         return -1;
+ 
+-    if (statfs(dirpath, &sb) < 0) {
++    if (rc != 0) {
+         virReportSystemError(errno,
+                              _("cannot determine filesystem for '%1$s'"),
+                              path);
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-util-Fix-typo-in-virNetDevOpenvswitchInterfaceSetQos.patch b/SOURCES/libvirt-util-Fix-typo-in-virNetDevOpenvswitchInterfaceSetQos.patch
deleted file mode 100644
index e9dd36a..0000000
--- a/SOURCES/libvirt-util-Fix-typo-in-virNetDevOpenvswitchInterfaceSetQos.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f58977a1475e6222e40e0cb93e9eef76da48012e Mon Sep 17 00:00:00 2001
-Message-ID: <f58977a1475e6222e40e0cb93e9eef76da48012e.1734433245.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 4 Dec 2024 11:53:47 +0100
-Subject: [PATCH] util: Fix typo in virNetDevOpenvswitchInterfaceSetQos
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The typo is causing virtqemud to crash when starting a domain with ovs
-bridge interface and QOS.
-
-https://issues.redhat.com/browse/RHEL-69840
-
-Fixes: a3b8753db975d8b92b122ccc7daee986974f8b18
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit dba710374d92688f797bf64642cc0d640c301239)
-
-https://issues.redhat.com/browse/RHEL-69938
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virnetdevopenvswitch.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
-index a1bd9f3d5b..0f5d23b794 100644
---- a/src/util/virnetdevopenvswitch.c
-+++ b/src/util/virnetdevopenvswitch.c
-@@ -958,7 +958,7 @@ virNetDevOpenvswitchInterfaceSetQos(const char *ifname,
-     }
- 
-     if (rx) {
--        if (rx->peak && tx->peak != rx->average) {
-+        if (rx->peak && rx->peak != rx->average) {
-             VIR_WARN("Setting different 'peak' value than 'average' for QoS for OVS interface %s might have unexpected results",
-                      ifname);
-         }
--- 
-2.47.1
diff --git a/SOURCES/libvirt-util-Move-openning-IOMMU-device-to-viriommufd.patch b/SOURCES/libvirt-util-Move-openning-IOMMU-device-to-viriommufd.patch
new file mode 100644
index 0000000..a948587
--- /dev/null
+++ b/SOURCES/libvirt-util-Move-openning-IOMMU-device-to-viriommufd.patch
@@ -0,0 +1,115 @@
+From 3fab098321e026e0ee33c8ef3c3e45f9976375d9 Mon Sep 17 00:00:00 2001
+Message-ID: <3fab098321e026e0ee33c8ef3c3e45f9976375d9.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 15:32:24 +0100
+Subject: [PATCH] util: Move openning IOMMU device to viriommufd
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit c684b83a68158cd15e262523db11259c9edabe4a)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/libvirt_private.syms |  2 +-
+ src/qemu/qemu_process.c  |  9 +--------
+ src/util/viriommufd.c    | 22 +++++++++++++++++++---
+ src/util/viriommufd.h    |  2 +-
+ 4 files changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index 0904265459..6c4918da9e 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -2653,7 +2653,7 @@ virInitctlFifos;
+ virInitctlSetRunLevel;
+ 
+ # util/viriommufd.h
+-virIOMMUFDSetRLimitMode;
++virIOMMUFDOpenDevice;
+ virIOMMUFDSupported;
+ 
+ # util/viriscsi.h
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 479437fb34..dd165512f3 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7689,15 +7689,8 @@ qemuProcessOpenIommuFd(virDomainObj *vm)
+ 
+     VIR_DEBUG("Opening IOMMU FD for domain %s", vm->def->name);
+ 
+-    if ((fd = open(VIR_IOMMU_DEV_PATH, O_RDWR | O_CLOEXEC)) < 0) {
+-        virReportSystemError(errno, "%s", _("cannot open /dev/iommu"));
++    if ((fd = virIOMMUFDOpenDevice()) < 0)
+         return -1;
+-    }
+-
+-    if (virIOMMUFDSetRLimitMode(fd, true) < 0) {
+-        VIR_FORCE_CLOSE(fd);
+-        return -1;
+-    }
+ 
+     VIR_DEBUG("Opened IOMMU FD %d for domain %s", fd, vm->def->name);
+     return fd;
+diff --git a/src/util/viriommufd.c b/src/util/viriommufd.c
+index 44b30029a5..1f3353eab4 100644
+--- a/src/util/viriommufd.c
++++ b/src/util/viriommufd.c
+@@ -1,5 +1,7 @@
+ #include <config.h>
+ 
++#include <fcntl.h>
++
+ #include "viriommufd.h"
+ #include "virlog.h"
+ #include "virerror.h"
+@@ -54,7 +56,7 @@ struct iommu_option {
+  *
+  * Returns: 0 on success, -1 on error
+  */
+-int
++static int
+ virIOMMUFDSetRLimitMode(int fd, bool processAccounting)
+ {
+     struct iommu_option option = {
+@@ -77,10 +79,24 @@ virIOMMUFDSetRLimitMode(int fd, bool processAccounting)
+     return 0;
+ }
+ 
++int
++virIOMMUFDOpenDevice(void)
++{
++    int fd = -1;
++
++    if ((fd = open(VIR_IOMMU_DEV_PATH, O_RDWR | O_CLOEXEC)) < 0)
++        virReportSystemError(errno, "%s", _("cannot open IOMMUFD device"));
++
++    if (virIOMMUFDSetRLimitMode(fd, true) < 0)
++        return -1;
++
++    return fd;
++}
++
+ #else
+ 
+-int virIOMMUFDSetRLimitMode(int fd G_GNUC_UNUSED,
+-                            bool processAccounting G_GNUC_UNUSED)
++int
++virIOMMUFDOpenDevice(void)
+ {
+     virReportError(VIR_ERR_NO_SUPPORT, "%s",
+                    _("IOMMUFD is not supported on this platform"));
+diff --git a/src/util/viriommufd.h b/src/util/viriommufd.h
+index ec6be9fa66..223f44eb5c 100644
+--- a/src/util/viriommufd.h
++++ b/src/util/viriommufd.h
+@@ -22,6 +22,6 @@
+ 
+ #define VIR_IOMMU_DEV_PATH "/dev/iommu"
+ 
+-int virIOMMUFDSetRLimitMode(int fd, bool processAccounting);
++int virIOMMUFDOpenDevice(void);
+ 
+ bool virIOMMUFDSupported(void);
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-util-Move-openning-VFIO-device-to-virpci.patch b/SOURCES/libvirt-util-Move-openning-VFIO-device-to-virpci.patch
new file mode 100644
index 0000000..d1c1524
--- /dev/null
+++ b/SOURCES/libvirt-util-Move-openning-VFIO-device-to-virpci.patch
@@ -0,0 +1,123 @@
+From 1fd6e9c874704fd5f13d7234424006061f8bbe8a Mon Sep 17 00:00:00 2001
+Message-ID: <1fd6e9c874704fd5f13d7234424006061f8bbe8a.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 17:39:05 +0100
+Subject: [PATCH] util: Move openning VFIO device to virpci
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 22c666097cc56919355e653010bff8ade5d5f12c)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/libvirt_private.syms |  1 +
+ src/qemu/qemu_process.c  | 23 +----------------------
+ src/util/virpci.c        | 28 ++++++++++++++++++++++++++++
+ src/util/virpci.h        |  2 ++
+ 4 files changed, 32 insertions(+), 22 deletions(-)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index 6c4918da9e..9ae44e31b8 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -3180,6 +3180,7 @@ virPCIDeviceListNew;
+ virPCIDeviceListSteal;
+ virPCIDeviceListStealIndex;
+ virPCIDeviceNew;
++virPCIDeviceOpenVfioFd;
+ virPCIDeviceReattach;
+ virPCIDeviceRebind;
+ virPCIDeviceReset;
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 71770d2099..55cd930df8 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7707,9 +7707,6 @@ qemuProcessOpenIommuFd(virDomainObj *vm)
+ static int
+ qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev)
+ {
+-    g_autofree char *vfioPath = NULL;
+-    int fd = -1;
+-
+     if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
+         hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+@@ -7717,25 +7714,7 @@ qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev)
+         return -1;
+     }
+ 
+-    if (virPCIDeviceGetVfioPath(&hostdev->source.subsys.u.pci.addr, &vfioPath) < 0)
+-        return -1;
+-
+-    VIR_DEBUG("Opening VFIO device %s", vfioPath);
+-
+-    if ((fd = open(vfioPath, O_RDWR | O_CLOEXEC)) < 0) {
+-        if (errno == ENOENT) {
+-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+-                           _("VFIO device %1$s not found - ensure device is bound to vfio-pci driver"),
+-                           vfioPath);
+-        } else {
+-            virReportSystemError(errno,
+-                                 _("cannot open VFIO device %1$s"), vfioPath);
+-        }
+-        return -1;
+-    }
+-
+-    VIR_DEBUG("Opened VFIO device FD %d for %s", fd, vfioPath);
+-    return fd;
++    return virPCIDeviceOpenVfioFd(&hostdev->source.subsys.u.pci.addr);
+ }
+ 
+ /**
+diff --git a/src/util/virpci.c b/src/util/virpci.c
+index 2348a98003..30feec6dae 100644
+--- a/src/util/virpci.c
++++ b/src/util/virpci.c
+@@ -3359,3 +3359,31 @@ virPCIDeviceGetVfioPath(virPCIDeviceAddress *addr,
+                    addrStr);
+     return -1;
+ }
++
++/**
++ * virPCIDeviceOpenVfioFd:
++ * @addr:
++ *
++ * Opens VFIO device and returns its FD.
++ *
++ * Returns: FD on success, -1 on failure
++ */
++int
++virPCIDeviceOpenVfioFd(virPCIDeviceAddress *addr)
++{
++    g_autofree char *vfioPath = NULL;
++    int fd = -1;
++
++    if (virPCIDeviceGetVfioPath(addr, &vfioPath) < 0)
++        return -1;
++
++    VIR_DEBUG("Opening VFIO device %s", vfioPath);
++
++    if ((fd = open(vfioPath, O_RDWR | O_CLOEXEC)) < 0) {
++        virReportSystemError(errno, _("cannot open VFIO device %1$s"), vfioPath);
++        return -1;
++    }
++
++    VIR_DEBUG("Opened VFIO device FD %d for %s", fd, vfioPath);
++    return fd;
++}
+diff --git a/src/util/virpci.h b/src/util/virpci.h
+index 24ede10755..7848567285 100644
+--- a/src/util/virpci.h
++++ b/src/util/virpci.h
+@@ -298,6 +298,8 @@ void virPCIDeviceAddressFree(virPCIDeviceAddress *address);
+ 
+ int virPCIDeviceGetVfioPath(virPCIDeviceAddress *addr, char **vfioPath);
+ 
++int virPCIDeviceOpenVfioFd(virPCIDeviceAddress *addr);
++
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIDevice, virPCIDeviceFree);
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIDeviceAddress, virPCIDeviceAddressFree);
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIEDeviceInfo, virPCIEDeviceInfoFree);
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-util-Rework-virFileIsSharedFSOverride-using-virFileCheckParents.patch b/SOURCES/libvirt-util-Rework-virFileIsSharedFSOverride-using-virFileCheckParents.patch
new file mode 100644
index 0000000..e5af23d
--- /dev/null
+++ b/SOURCES/libvirt-util-Rework-virFileIsSharedFSOverride-using-virFileCheckParents.patch
@@ -0,0 +1,84 @@
+From d85627338e531618aa72b6039483b0d0a3e3d474 Mon Sep 17 00:00:00 2001
+Message-ID: <d85627338e531618aa72b6039483b0d0a3e3d474.1766070256.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 5 Dec 2025 16:52:32 +0100
+Subject: [PATCH] util: Rework virFileIsSharedFSOverride using
+ virFileCheckParents
+
+The newly introduced virFileCheckParents is generic enough to be used
+for checking whether a specific path or any of its parents is included
+in the overrides array.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit eedf9ed68b45585569865604bf2a403670feaf3e)
+
+https://issues.redhat.com/browse/RHEL-135287
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/util/virfile.c | 35 ++++++++++++-----------------------
+ 1 file changed, 12 insertions(+), 23 deletions(-)
+
+diff --git a/src/util/virfile.c b/src/util/virfile.c
+index 52d711d2a9..05b2fa8168 100644
+--- a/src/util/virfile.c
++++ b/src/util/virfile.c
+@@ -3859,6 +3859,14 @@ virFileCheckParentsCanonicalize(const char *path,
+ }
+ 
+ 
++static bool
++virFileCheckParentsInOverrides(const char *path,
++                               void *opaque)
++{
++    return g_strv_contains((const char *const *) opaque, path);
++}
++
++
+ /**
+  * virFileIsSharedFSOverride:
+  * @path: Path to check
+@@ -3872,7 +3880,6 @@ virFileIsSharedFSOverride(const char *path,
+                           char *const *overrides)
+ {
+     g_autofree char *dirpath = NULL;
+-    char *p = NULL;
+     int rc;
+ 
+     if (!path || path[0] != '/' || !overrides)
+@@ -3894,29 +3901,11 @@ virFileIsSharedFSOverride(const char *path,
+         return false;
+     }
+ 
+-    if (g_strv_contains((const char *const *) overrides, dirpath))
+-        return true;
++    if (virFileCheckParents(dirpath, NULL, virFileCheckParentsInOverrides,
++                            (void *) overrides) < 0)
++        return false;
+ 
+-    /* Continue until we've scanned the entire path */
+-    while (p != dirpath) {
+-
+-        /* Find the last slash */
+-        if ((p = strrchr(dirpath, '/')) == NULL)
+-            break;
+-
+-        /* Truncate the path by overwriting the slash that we've just
+-         * found with a null byte. If it is the very first slash in
+-         * the path, we need to handle things slightly differently */
+-        if (p == dirpath)
+-            *(p+1) = '\0';
+-        else
+-            *p = '\0';
+-
+-        if (g_strv_contains((const char *const *) overrides, dirpath))
+-            return true;
+-    }
+-
+-    return false;
++    return true;
+ }
+ 
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-util-Use-virPCIDevice-as-argument-in-virPCIDeviceGetVfioPath.patch b/SOURCES/libvirt-util-Use-virPCIDevice-as-argument-in-virPCIDeviceGetVfioPath.patch
new file mode 100644
index 0000000..a453500
--- /dev/null
+++ b/SOURCES/libvirt-util-Use-virPCIDevice-as-argument-in-virPCIDeviceGetVfioPath.patch
@@ -0,0 +1,143 @@
+From 065abe6cc4235f285ac2722604c6f4b722f251c3 Mon Sep 17 00:00:00 2001
+Message-ID: <065abe6cc4235f285ac2722604c6f4b722f251c3.1771423832.git.jdenemar@redhat.com>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Sun, 15 Feb 2026 17:51:46 +0100
+Subject: [PATCH] util: Use virPCIDevice as argument in virPCIDeviceGetVfioPath
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 3365bff598a0d0a5b21afc7060e10a0a2f7d21a7)
+
+Resolves: https://issues.redhat.com/browse/RHEL-150353
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ src/security/security_apparmor.c |  2 +-
+ src/security/security_dac.c      |  4 ++--
+ src/security/security_selinux.c  |  4 ++--
+ src/util/virpci.c                | 14 ++++++++------
+ src/util/virpci.h                |  2 +-
+ 5 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
+index 934acfb461..6c5da2a650 100644
+--- a/src/security/security_apparmor.c
++++ b/src/security/security_apparmor.c
+@@ -860,7 +860,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *mgr,
+             } else {
+                 g_autofree char *vfiofdDev = NULL;
+ 
+-                if (virPCIDeviceGetVfioPath(&dev->source.subsys.u.pci.addr, &vfiofdDev) < 0)
++                if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0)
+                     goto done;
+ 
+                 ret = AppArmorSetSecurityPCILabel(pci, vfiofdDev, ptr);
+diff --git a/src/security/security_dac.c b/src/security/security_dac.c
+index d0ed22db2d..704c8dbfec 100644
+--- a/src/security/security_dac.c
++++ b/src/security/security_dac.c
+@@ -1295,7 +1295,7 @@ virSecurityDACSetHostdevLabel(virSecurityManager *mgr,
+             } else {
+                 g_autofree char *vfiofdDev = NULL;
+ 
+-                if (virPCIDeviceGetVfioPath(&dev->source.subsys.u.pci.addr, &vfiofdDev) < 0)
++                if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0)
+                     return -1;
+ 
+                 ret = virSecurityDACSetHostdevLabelHelper(vfiofdDev, false, &cbdata);
+@@ -1468,7 +1468,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManager *mgr,
+             } else {
+                 g_autofree char *vfiofdDev = NULL;
+ 
+-                if (virPCIDeviceGetVfioPath(&dev->source.subsys.u.pci.addr, &vfiofdDev) < 0)
++                if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0)
+                     return -1;
+ 
+                 ret = virSecurityDACRestoreFileLabelInternal(mgr, NULL,
+diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
+index 834383a7de..4a5f61d16b 100644
+--- a/src/security/security_selinux.c
++++ b/src/security/security_selinux.c
+@@ -2269,7 +2269,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManager *mgr,
+             } else {
+                 g_autofree char *vfiofdDev = NULL;
+ 
+-                if (virPCIDeviceGetVfioPath(&dev->source.subsys.u.pci.addr, &vfiofdDev) < 0)
++                if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0)
+                     return -1;
+ 
+                 ret = virSecuritySELinuxSetHostdevLabelHelper(vfiofdDev, false, &data);
+@@ -2515,7 +2515,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManager *mgr,
+             } else {
+                 g_autofree char *vfiofdDev = NULL;
+ 
+-                if (virPCIDeviceGetVfioPath(&dev->source.subsys.u.pci.addr, &vfiofdDev) < 0)
++                if (virPCIDeviceGetVfioPath(pci, &vfiofdDev) < 0)
+                     return -1;
+ 
+                 ret = virSecuritySELinuxRestoreFileLabel(mgr, vfiofdDev, false, false);
+diff --git a/src/util/virpci.c b/src/util/virpci.c
+index 30feec6dae..78c47869ef 100644
+--- a/src/util/virpci.c
++++ b/src/util/virpci.c
+@@ -3331,19 +3331,17 @@ virPCIDeviceAddressFree(virPCIDeviceAddress *address)
+  * Returns: 0 on success, -1 on failure
+  */
+ int
+-virPCIDeviceGetVfioPath(virPCIDeviceAddress *addr,
++virPCIDeviceGetVfioPath(virPCIDevice *pci,
+                         char **vfioPath)
+ {
+-    g_autofree char *addrStr = NULL;
+     g_autofree char *sysfsPath = NULL;
+     g_autoptr(DIR) dir = NULL;
+     struct dirent *entry = NULL;
+ 
+     *vfioPath = NULL;
+-    addrStr = virPCIDeviceAddressAsString(addr);
+ 
+     /* Look in device's vfio-dev subdirectory */
+-    sysfsPath = g_strdup_printf("/sys/bus/pci/devices/%s/vfio-dev/", addrStr);
++    sysfsPath = virPCIFile(pci->name, "vfio-dev");
+ 
+     if (virDirOpen(&dir, sysfsPath) == 1) {
+         while (virDirRead(dir, &entry, sysfsPath) > 0) {
+@@ -3356,7 +3354,7 @@ virPCIDeviceGetVfioPath(virPCIDeviceAddress *addr,
+ 
+     virReportError(VIR_ERR_INTERNAL_ERROR,
+                    _("cannot find VFIO device for PCI device %1$s"),
+-                   addrStr);
++                   pci->name);
+     return -1;
+ }
+ 
+@@ -3371,10 +3369,14 @@ virPCIDeviceGetVfioPath(virPCIDeviceAddress *addr,
+ int
+ virPCIDeviceOpenVfioFd(virPCIDeviceAddress *addr)
+ {
++    g_autoptr(virPCIDevice) pci = NULL;
+     g_autofree char *vfioPath = NULL;
+     int fd = -1;
+ 
+-    if (virPCIDeviceGetVfioPath(addr, &vfioPath) < 0)
++    if (!(pci = virPCIDeviceNew(addr)))
++        return -1;
++
++    if (virPCIDeviceGetVfioPath(pci, &vfioPath) < 0)
+         return -1;
+ 
+     VIR_DEBUG("Opening VFIO device %s", vfioPath);
+diff --git a/src/util/virpci.h b/src/util/virpci.h
+index 7848567285..933099da6c 100644
+--- a/src/util/virpci.h
++++ b/src/util/virpci.h
+@@ -296,7 +296,7 @@ void virPCIEDeviceInfoFree(virPCIEDeviceInfo *dev);
+ 
+ void virPCIDeviceAddressFree(virPCIDeviceAddress *address);
+ 
+-int virPCIDeviceGetVfioPath(virPCIDeviceAddress *addr, char **vfioPath);
++int virPCIDeviceGetVfioPath(virPCIDevice *pci, char **vfioPath);
+ 
+ int virPCIDeviceOpenVfioFd(virPCIDeviceAddress *addr);
+ 
+-- 
+2.53.0
diff --git a/SOURCES/libvirt-util-don-t-attempt-to-acquire-logind-inhibitor-if-not-requested.patch b/SOURCES/libvirt-util-don-t-attempt-to-acquire-logind-inhibitor-if-not-requested.patch
deleted file mode 100644
index e722ccd..0000000
--- a/SOURCES/libvirt-util-don-t-attempt-to-acquire-logind-inhibitor-if-not-requested.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ceeaa000473ddb72db453f7e38943b961ca16c22 Mon Sep 17 00:00:00 2001
-Message-ID: <ceeaa000473ddb72db453f7e38943b961ca16c22.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 8 Jan 2025 17:37:03 +0000
-Subject: [PATCH] util: don't attempt to acquire logind inhibitor if not
- requested
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When VIR_INHIBITOR_WHAT_NONE is passed to virInhibitorNew, it is
-an indication that daemon shutdown should be inhibited, but no
-OS level inhibitors acquired. This is done by the virtnetworkd
-daemon, for example, to prevent shutdown while running virtual
-machines are present, without blocking / delaying OS shutdown.
-
-Unfortunately the code forgot to skip the DBus call in this case,
-resulting in errors being logged.
-
-Reviewed-by: Laine Stump <laine@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit caa10431cdd1aa476637ff721f1947c4e0b53da1)
-Resolves: https://issues.redhat.com/browse/RHEL-83064
----
- src/util/virinhibitor.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virinhibitor.c b/src/util/virinhibitor.c
-index 647bdc9fbb..a95021de5a 100644
---- a/src/util/virinhibitor.c
-+++ b/src/util/virinhibitor.c
-@@ -152,7 +152,7 @@ virInhibitor *virInhibitorNew(virInhibitorWhat what,
-     virInhibitor *inhibitor = g_new0(virInhibitor, 1);
- 
-     inhibitor->fd = -1;
--    inhibitor->what = virInhibitorWhatFormat(what);
-+    inhibitor->what = what ? virInhibitorWhatFormat(what) : NULL;
-     inhibitor->who = g_strdup(who);
-     inhibitor->why = g_strdup(why);
-     inhibitor->mode = virInhibitorModeTypeToString(mode);
-@@ -171,7 +171,8 @@ void virInhibitorHold(virInhibitor *inhibitor)
-             inhibitor->action(true, inhibitor->actionData);
-         }
- #ifdef G_OS_UNIX
--        if (virInhibitorAcquire(
-+        if (inhibitor->what &&
-+            virInhibitorAcquire(
-                 inhibitor->what, inhibitor->who, inhibitor->why,
-                 inhibitor->mode, &inhibitor->fd) < 0) {
-             VIR_ERROR(_("Failed to acquire inhibitor: %1$s"),
--- 
-2.49.0
diff --git a/SOURCES/libvirt-util-fix-off-by-1-in-inhibitor-constants.patch b/SOURCES/libvirt-util-fix-off-by-1-in-inhibitor-constants.patch
deleted file mode 100644
index 3d1861a..0000000
--- a/SOURCES/libvirt-util-fix-off-by-1-in-inhibitor-constants.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 593bba2d87b7e2bcfedd544d7d48eba936b7a212 Mon Sep 17 00:00:00 2001
-Message-ID: <593bba2d87b7e2bcfedd544d7d48eba936b7a212.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 7 Jan 2025 15:21:18 +0000
-Subject: [PATCH] util: fix off-by-1 in inhibitor constants
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The inhibitor constant values were off-by-1, so when converted into
-string format, we picked the wrong names
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit fc3a60d9d7b29283a0b2d57bb06d15fb597a5003)
-Resolves: https://issues.redhat.com/browse/RHEL-83064
----
- src/util/virinhibitor.h | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/util/virinhibitor.h b/src/util/virinhibitor.h
-index 0a1c445d41..49cf32fbeb 100644
---- a/src/util/virinhibitor.h
-+++ b/src/util/virinhibitor.h
-@@ -26,13 +26,13 @@ typedef struct _virInhibitor virInhibitor;
- 
- typedef enum {
-     VIR_INHIBITOR_WHAT_NONE          = 0,
--    VIR_INHIBITOR_WHAT_SLEEP         = (1 << 1),
--    VIR_INHIBITOR_WHAT_SHUTDOWN      = (1 << 2),
--    VIR_INHIBITOR_WHAT_IDLE          = (1 << 3),
--    VIR_INHIBITOR_WHAT_POWER_KEY     = (1 << 4),
--    VIR_INHIBITOR_WHAT_SUSPEND_KEY   = (1 << 5),
--    VIR_INHIBITOR_WHAT_HIBERNATE_KEY = (1 << 6),
--    VIR_INHIBITOR_WHAT_LID_SWITCH    = (1 << 7),
-+    VIR_INHIBITOR_WHAT_SLEEP         = (1 << 0),
-+    VIR_INHIBITOR_WHAT_SHUTDOWN      = (1 << 1),
-+    VIR_INHIBITOR_WHAT_IDLE          = (1 << 2),
-+    VIR_INHIBITOR_WHAT_POWER_KEY     = (1 << 3),
-+    VIR_INHIBITOR_WHAT_SUSPEND_KEY   = (1 << 4),
-+    VIR_INHIBITOR_WHAT_HIBERNATE_KEY = (1 << 5),
-+    VIR_INHIBITOR_WHAT_LID_SWITCH    = (1 << 6),
- } virInhibitorWhat;
- 
- typedef enum {
--- 
-2.49.0
diff --git a/SOURCES/libvirt-util-introduce-object-for-holding-a-system-inhibitor-lock.patch b/SOURCES/libvirt-util-introduce-object-for-holding-a-system-inhibitor-lock.patch
deleted file mode 100644
index 5424cb6..0000000
--- a/SOURCES/libvirt-util-introduce-object-for-holding-a-system-inhibitor-lock.patch
+++ /dev/null
@@ -1,375 +0,0 @@
-From 4c1429d270836f0e6ab04b052f1184d72d21193c Mon Sep 17 00:00:00 2001
-Message-ID: <4c1429d270836f0e6ab04b052f1184d72d21193c.1742990721.git.jdenemar@redhat.com>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 16 Dec 2024 15:19:34 +0000
-Subject: [PATCH] util: introduce object for holding a system inhibitor lock
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The system inhibitor locks are currently handled by code in the
-virNetDaemon class. The driver code invokes a callback provided
-by the daemon when it wants to start or end inhibition.
-
-When the first inhibition is started, the daemon will call out
-to logind to apply it system wide.
-
-This has many flaws
-
- * A single message is registered with logind regardless of
-   what driver holds the inhibition
- * An inhibition of daemon shutdown can't be acquired
-   without also inhibiting system shutdown
- * Config of the inhibitions cannot be tailored by the
-   driver
-
-The new virInhibitor object addresses these:
-
- * The object directly manages an inhibition with logind
-   privately to the driver, enabling custom messages to
-   be set.
- * It is possible to acquire an inhibition locally to the
-   daemon without forwarding it to logind.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit d2e5aa4f4e1501149c9e3095d38ebc04c9a4ba31)
-Resolves: https://issues.redhat.com/browse/RHEL-83064
----
- po/POTFILES              |   1 +
- src/libvirt_private.syms |   7 ++
- src/util/meson.build     |   1 +
- src/util/virinhibitor.c  | 214 +++++++++++++++++++++++++++++++++++++++
- src/util/virinhibitor.h  |  58 +++++++++++
- 5 files changed, 281 insertions(+)
- create mode 100644 src/util/virinhibitor.c
- create mode 100644 src/util/virinhibitor.h
-
-diff --git a/po/POTFILES b/po/POTFILES
-index 3514aa3dca..c71e439fe3 100644
---- a/po/POTFILES
-+++ b/po/POTFILES
-@@ -293,6 +293,7 @@ src/util/virhostcpu.c
- src/util/virhostmem.c
- src/util/virhostuptime.c
- src/util/viridentity.c
-+src/util/virinhibitor.c
- src/util/virinitctl.c
- src/util/viriscsi.c
- src/util/virjson.c
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 7d404fdbf5..727ab52cfe 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2605,6 +2605,13 @@ virIdentitySetUserName;
- virIdentitySetX509DName;
- 
- 
-+# util/virinhibitor.h
-+virInhibitorFree;
-+virInhibitorHold;
-+virInhibitorNew;
-+virInhibitorRelease;
-+
-+
- # util/virinitctl.h
- virInitctlFifos;
- virInitctlSetRunLevel;
-diff --git a/src/util/meson.build b/src/util/meson.build
-index 30f71b0227..69ef49139a 100644
---- a/src/util/meson.build
-+++ b/src/util/meson.build
-@@ -45,6 +45,7 @@ util_sources = [
-   'virhostmem.c',
-   'virhostuptime.c',
-   'viridentity.c',
-+  'virinhibitor.c',
-   'virinitctl.c',
-   'viriscsi.c',
-   'virjson.c',
-diff --git a/src/util/virinhibitor.c b/src/util/virinhibitor.c
-new file mode 100644
-index 0000000000..647bdc9fbb
---- /dev/null
-+++ b/src/util/virinhibitor.c
-@@ -0,0 +1,214 @@
-+/*
-+ * virinhibitor.c: helper APIs for inhibiting host actions
-+ *
-+ * Copyright (C) 2024 Red Hat, Inc.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library.  If not, see
-+ * <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <config.h>
-+
-+#include "virinhibitor.h"
-+#include "virgdbus.h"
-+#include "virsystemd.h"
-+#include "virfile.h"
-+#include "virlog.h"
-+#include "virenum.h"
-+
-+#define VIR_FROM_THIS VIR_FROM_NONE
-+
-+VIR_LOG_INIT("util.inhibitor");
-+
-+struct _virInhibitor {
-+    GMutex lock;
-+    size_t count;
-+    int fd;
-+
-+    char *what;
-+    char *who;
-+    char *why;
-+    const char *mode;
-+
-+    virInhibitorAction action;
-+    void *actionData;
-+};
-+
-+VIR_ENUM_DECL(virInhibitorMode);
-+
-+VIR_ENUM_IMPL(virInhibitorMode,
-+              VIR_INHIBITOR_MODE_LAST,
-+              "block", "delay");
-+
-+#ifdef G_OS_UNIX
-+/* As per: https://www.freedesktop.org/wiki/Software/systemd/inhibit */
-+static int
-+virInhibitorAcquire(const char *what,
-+                    const char *who,
-+                    const char *why,
-+                    const char *mode,
-+                    int *inhibitorFD)
-+{
-+    g_autoptr(GVariant) reply = NULL;
-+    g_autoptr(GUnixFDList) replyFD = NULL;
-+    g_autoptr(GVariant) message = NULL;
-+    GDBusConnection *systemBus;
-+    int fd;
-+    int rc;
-+
-+    VIR_DEBUG("what=%s who=%s why=%s mode=%s",
-+              NULLSTR(what), NULLSTR(who), NULLSTR(why), NULLSTR(mode));
-+
-+    if (!(systemBus = virGDBusGetSystemBus())) {
-+        VIR_DEBUG("system dbus not available, skipping system inhibitor");
-+        return 0;
-+    }
-+
-+    if (virSystemdHasLogind() < 0) {
-+        VIR_DEBUG("logind not available, skipping system inhibitor");
-+        return 0;
-+    }
-+
-+    message = g_variant_new("(ssss)", what, who, why, mode);
-+
-+    rc = virGDBusCallMethodWithFD(systemBus,
-+                                  &reply,
-+                                  G_VARIANT_TYPE("(h)"),
-+                                  &replyFD,
-+                                  NULL,
-+                                  "org.freedesktop.login1",
-+                                  "/org/freedesktop/login1",
-+                                  "org.freedesktop.login1.Manager",
-+                                  "Inhibit",
-+                                  message,
-+                                  NULL);
-+
-+    if (rc < 0)
-+        return -1;
-+
-+    if (g_unix_fd_list_get_length(replyFD) <= 0) {
-+        VIR_DEBUG("Missing inhibitor FD in logind reply");
-+        return -1;
-+    }
-+
-+    fd = g_unix_fd_list_get(replyFD, 0, NULL);
-+    if (fd < 0) {
-+        VIR_DEBUG("Unable to get inhibitor FD from logind reply");
-+        return -1;
-+    }
-+
-+    *inhibitorFD = fd;
-+    VIR_DEBUG("Got inhibitor FD %d", fd);
-+    return 0;
-+}
-+#endif
-+
-+
-+static char *
-+virInhibitorWhatFormat(virInhibitorWhat what)
-+{
-+    const char *whatstr[] = {
-+        "sleep",
-+        "shutdown",
-+        "idle",
-+        "handle-power-key",
-+        "handle-suspend-key",
-+        "handle-hibernate-key",
-+        "handle-lid-switch",
-+    };
-+    GString *str = g_string_new("");
-+    size_t i;
-+
-+    for (i = 0; i < G_N_ELEMENTS(whatstr); i++) {
-+        if (what & (1 << i)) {
-+            if (str->len)
-+                g_string_append(str, ":");
-+            g_string_append(str, whatstr[i]);
-+        }
-+    }
-+
-+    return g_string_free(str, FALSE);
-+}
-+
-+
-+virInhibitor *virInhibitorNew(virInhibitorWhat what,
-+                              const char *who,
-+                              const char *why,
-+                              virInhibitorMode mode,
-+                              virInhibitorAction action,
-+                              void *actionData)
-+{
-+    virInhibitor *inhibitor = g_new0(virInhibitor, 1);
-+
-+    inhibitor->fd = -1;
-+    inhibitor->what = virInhibitorWhatFormat(what);
-+    inhibitor->who = g_strdup(who);
-+    inhibitor->why = g_strdup(why);
-+    inhibitor->mode = virInhibitorModeTypeToString(mode);
-+    inhibitor->action = action;
-+    inhibitor->actionData = actionData;
-+
-+    return inhibitor;
-+}
-+
-+void virInhibitorHold(virInhibitor *inhibitor)
-+{
-+    g_mutex_lock(&inhibitor->lock);
-+
-+    if (inhibitor->count == 0) {
-+        if (inhibitor->action) {
-+            inhibitor->action(true, inhibitor->actionData);
-+        }
-+#ifdef G_OS_UNIX
-+        if (virInhibitorAcquire(
-+                inhibitor->what, inhibitor->who, inhibitor->why,
-+                inhibitor->mode, &inhibitor->fd) < 0) {
-+            VIR_ERROR(_("Failed to acquire inhibitor: %1$s"),
-+                      virGetLastErrorMessage());
-+            virResetLastError();
-+        }
-+#else
-+        VIR_DEBUG("No inhibitor implementation on non-UNIX platforms");
-+#endif
-+    }
-+    inhibitor->count++;
-+    g_mutex_unlock(&inhibitor->lock);
-+}
-+
-+
-+void virInhibitorRelease(virInhibitor *inhibitor)
-+{
-+    g_mutex_lock(&inhibitor->lock);
-+    inhibitor->count--;
-+    if (inhibitor->count == 0) {
-+        VIR_FORCE_CLOSE(inhibitor->fd);
-+        if (inhibitor->action) {
-+            inhibitor->action(false, inhibitor->actionData);
-+        }
-+    }
-+    g_mutex_unlock(&inhibitor->lock);
-+}
-+
-+
-+void virInhibitorFree(virInhibitor *inhibitor)
-+{
-+    if (!inhibitor)
-+        return;
-+
-+    g_free(inhibitor->what);
-+    g_free(inhibitor->who);
-+    g_free(inhibitor->why);
-+    VIR_FORCE_CLOSE(inhibitor->fd);
-+    g_free(inhibitor);
-+}
-diff --git a/src/util/virinhibitor.h b/src/util/virinhibitor.h
-new file mode 100644
-index 0000000000..0a1c445d41
---- /dev/null
-+++ b/src/util/virinhibitor.h
-@@ -0,0 +1,58 @@
-+/*
-+ * virinhibitor.h: helper APIs for inhibiting host actions
-+ *
-+ * Copyright (C) 2024 Red Hat, Inc.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library.  If not, see
-+ * <http://www.gnu.org/licenses/>.
-+ */
-+
-+#pragma once
-+
-+#include "internal.h"
-+
-+typedef struct _virInhibitor virInhibitor;
-+
-+typedef enum {
-+    VIR_INHIBITOR_WHAT_NONE          = 0,
-+    VIR_INHIBITOR_WHAT_SLEEP         = (1 << 1),
-+    VIR_INHIBITOR_WHAT_SHUTDOWN      = (1 << 2),
-+    VIR_INHIBITOR_WHAT_IDLE          = (1 << 3),
-+    VIR_INHIBITOR_WHAT_POWER_KEY     = (1 << 4),
-+    VIR_INHIBITOR_WHAT_SUSPEND_KEY   = (1 << 5),
-+    VIR_INHIBITOR_WHAT_HIBERNATE_KEY = (1 << 6),
-+    VIR_INHIBITOR_WHAT_LID_SWITCH    = (1 << 7),
-+} virInhibitorWhat;
-+
-+typedef enum {
-+    VIR_INHIBITOR_MODE_BLOCK,
-+    VIR_INHIBITOR_MODE_DELAY,
-+
-+    VIR_INHIBITOR_MODE_LAST
-+} virInhibitorMode;
-+
-+typedef void (*virInhibitorAction)(bool inhibited,
-+                                   void *opaque);
-+
-+virInhibitor *virInhibitorNew(virInhibitorWhat what,
-+                              const char *who,
-+                              const char *why,
-+                              virInhibitorMode mode,
-+                              virInhibitorAction action,
-+                              void *actionData);
-+
-+void virInhibitorHold(virInhibitor *inhibitor);
-+void virInhibitorRelease(virInhibitor *inhibitor);
-+
-+void virInhibitorFree(virInhibitor *inhibitor);
--- 
-2.49.0
diff --git a/SOURCES/libvirt-util-json-Increase-JSON-nesting-limit-when-parsing-to-300.patch b/SOURCES/libvirt-util-json-Increase-JSON-nesting-limit-when-parsing-to-300.patch
new file mode 100644
index 0000000..c04a3cd
--- /dev/null
+++ b/SOURCES/libvirt-util-json-Increase-JSON-nesting-limit-when-parsing-to-300.patch
@@ -0,0 +1,50 @@
+From 4540f9271990c01649029ab2c9fd6414109e6583 Mon Sep 17 00:00:00 2001
+Message-ID: <4540f9271990c01649029ab2c9fd6414109e6583.1768317034.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 11 Dec 2025 09:39:03 +0100
+Subject: [PATCH] util: json: Increase JSON nesting limit when parsing to 300
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The default in json-c is 32 which is too low to accomodate the 200
+snapshot layers we supported historically in the qemu driver (200 is
+picked based on the 256 layer limit in libxml).
+
+The response to 'query-block' is otherwise too low and we fail to start
+the VM when there's around 26 images in a backing chain.
+
+'json_tokener_new_ex' is supported since json-c 0.11 and we require at
+least 0.14.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit b49d41b7e9eb983fdfbf70c91c2a27a995af3987)
+https://issues.redhat.com/browse/RHEL-135128
+---
+ src/util/virjson.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/virjson.c b/src/util/virjson.c
+index a799707c16..454bd657be 100644
+--- a/src/util/virjson.c
++++ b/src/util/virjson.c
+@@ -1466,7 +1466,15 @@ virJSONValueFromString(const char *jsonstring)
+ 
+     VIR_DEBUG("string=%s", jsonstring);
+ 
+-    tok = json_tokener_new();
++    /* When creating the tokener we need to specify the limit of the nesting
++     * depth of JSON objects. The default in json-c is 32. Since we need to
++     * support at least 200 layers of snapshots (the limit is based on a
++     * conservative take on the 256 layer nesting limit for XML in libxml), for
++     * which we have internal checks, we also need to set the JSON limit to
++     * be able to parse qemu responses for such a deeply nested snapshot list.
++     * '300' is picked a sa conservative buffer on top of the 200 layers plus
++     * some of the extra wrappers that qemu adds*/
++    tok = json_tokener_new_ex(300);
+     if (!tok) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                        _("failed to create JSON tokener"));
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-utils-Canonicalize-paths-before-comparing-them.patch b/SOURCES/libvirt-utils-Canonicalize-paths-before-comparing-them.patch
deleted file mode 100644
index 5303b63..0000000
--- a/SOURCES/libvirt-utils-Canonicalize-paths-before-comparing-them.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 4eacc6c63a2935cd25bb404639ce8c8bd0747866 Mon Sep 17 00:00:00 2001
-Message-ID: <4eacc6c63a2935cd25bb404639ce8c8bd0747866.1739824250.git.jdenemar@redhat.com>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Thu, 13 Feb 2025 09:54:05 +0100
-Subject: [PATCH] utils: Canonicalize paths before comparing them
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In virFileIsSharedFSOverride() we compare a path against a list
-of overrides looking for a match.
-
-All overrides are canonicalized ahead of time though, so e.g.
-/var/run/foo will be turned into /run/foo due to /var/run being
-a symlink on modern Linux systems. But the path we're trying to
-match with the overrides doesn't get the same treatment, so in
-this scenario the comparison will always fail.
-
-Canonicalizing the path as well solves the issue.
-
-Resolves: https://issues.redhat.com/browse/RHEL-79165
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit f2023e8018fe18550ad6aec66fe72bd1376f8522)
-
-https://issues.redhat.com/browse/RHEL-79166
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
----
- src/util/virfile.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index 6ac0f4efb3..7cab3d0cd6 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -3823,10 +3823,13 @@ virFileIsSharedFSOverride(const char *path,
-     if (!path || path[0] != '/' || !overrides)
-         return false;
- 
--    if (g_strv_contains((const char *const *) overrides, path))
--        return true;
-+    /* Overrides have been canonicalized ahead of time, so we need to
-+     * do the same for the provided path or we'll never be able to
-+     * find a match if symlinks are involved */
-+    dirpath = virFileCanonicalizePath(path);
- 
--    dirpath = g_strdup(path);
-+    if (g_strv_contains((const char *const *) overrides, dirpath))
-+        return true;
- 
-     /* Continue until we've scanned the entire path */
-     while (p != dirpath) {
--- 
-2.48.1
diff --git a/SOURCES/libvirt-virDomainGetMessages-Introduce-VIR_DOMAIN_MESSAGE_IOERRORS.patch b/SOURCES/libvirt-virDomainGetMessages-Introduce-VIR_DOMAIN_MESSAGE_IOERRORS.patch
deleted file mode 100644
index 161994b..0000000
--- a/SOURCES/libvirt-virDomainGetMessages-Introduce-VIR_DOMAIN_MESSAGE_IOERRORS.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From b4154f389e688beafc9cbfae7e868fa406c8448d Mon Sep 17 00:00:00 2001
-Message-ID: <b4154f389e688beafc9cbfae7e868fa406c8448d.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 27 Jan 2025 19:13:43 +0100
-Subject: [PATCH] virDomainGetMessages: Introduce VIR_DOMAIN_MESSAGE_IOERRORS
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Report any stored I/O error messages reported by the hypervisor when
-reporting messages of a domain. As the I/O error may be already stale we
-report also the timestamp when it was recorded.
-
-Example message:
-
- I/O error: disk='vda', index='1', path='/dev/mapper/errdev0', timestamp='2025-01-28 15:47:52.776+0000', message='Input/output error'
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 666219f5f166ac3cebe4854bcefddd449a98ad04)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- include/libvirt/libvirt-domain.h |  3 ++
- src/conf/domain_conf.c           | 50 ++++++++++++++++++++++++++++++++
- src/conf/domain_conf.h           |  5 ++++
- src/libvirt_private.syms         |  1 +
- src/libxl/libxl_driver.c         |  3 +-
- src/qemu/qemu_driver.c           | 16 +++++++++-
- src/test/test_driver.c           |  3 +-
- 7 files changed, 78 insertions(+), 3 deletions(-)
-
-diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index d4f1573954..92a32f1cde 100644
---- a/include/libvirt/libvirt-domain.h
-+++ b/include/libvirt/libvirt-domain.h
-@@ -6490,6 +6490,9 @@ int virDomainAuthorizedSSHKeysSet(virDomainPtr domain,
- typedef enum {
-     VIR_DOMAIN_MESSAGE_DEPRECATION = (1 << 0), /* (Since: 7.1.0) */
-     VIR_DOMAIN_MESSAGE_TAINTING = (1 << 1), /* (Since: 7.1.0) */
-+    VIR_DOMAIN_MESSAGE_IOERRORS = (1 << 2), /* Report available stored I/O
-+                                               errors messages for disk images
-+                                               (Since: 11.1.0) */
- } virDomainMessageType;
- 
- int virDomainGetMessages(virDomainPtr domain,
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 8cd0fb83b6..d83f1ba240 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -31643,6 +31643,47 @@ virHostdevIsPCIDevice(const virDomainHostdevDef *hostdev)
- }
- 
- 
-+static void
-+virDomainObjGetMessagesIOErrorsSrc(virStorageSource *src,
-+                                   const char *diskdst,
-+                                   GPtrArray *m)
-+{
-+    if (!src ||
-+        !src->ioerror_message)
-+        return;
-+
-+    g_ptr_array_add(m, g_strdup_printf(_("I/O error: disk='%1$s', index='%2$d', path='%3$s', timestamp='%4$s', message='%5$s'"),
-+                                       NULLSTR_MINUS(diskdst),
-+                                       src->id,
-+                                       NULLSTR_MINUS(src->path),
-+                                       src->ioerror_timestamp,
-+                                       src->ioerror_message));
-+}
-+
-+
-+void
-+virDomainObjGetMessagesIOErrorsChain(virStorageSource *src,
-+                                     const char *diskdst,
-+                                     GPtrArray *m)
-+{
-+    virStorageSource *n;
-+
-+    for (n = src; n; n = n->backingStore) {
-+        virDomainObjGetMessagesIOErrorsSrc(n, diskdst, m);
-+        virDomainObjGetMessagesIOErrorsSrc(n->dataFileStore, diskdst, m);
-+    }
-+}
-+
-+
-+static void
-+virDomainObjGetMessagesIOErrorsDisk(virDomainDiskDef *disk,
-+                                    GPtrArray *m)
-+{
-+    virDomainObjGetMessagesIOErrorsChain(disk->src, disk->dst, m);
-+    virDomainObjGetMessagesIOErrorsChain(disk->mirror, disk->dst, m);
-+}
-+
-+
- /**
-  * virDomainObjGetMessages:
-  * @vm: domain object
-@@ -31671,6 +31712,15 @@ virDomainObjGetMessages(virDomainObj *vm,
-                                                vm->deprecations[i]));
-         }
-     }
-+
-+    if (!flags || (flags & VIR_DOMAIN_MESSAGE_IOERRORS)) {
-+        if (vm->def->os.loader)
-+            virDomainObjGetMessagesIOErrorsChain(vm->def->os.loader->nvram, NULL, m);
-+
-+        for (i = 0; i < vm->def->ndisks; i++)
-+            virDomainObjGetMessagesIOErrorsDisk(vm->def->disks[i], m);
-+    }
-+
- }
- 
- bool
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 7058203e67..5237046196 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -4576,6 +4576,11 @@ bool
- virHostdevIsPCIDevice(const virDomainHostdevDef *hostdev)
-     ATTRIBUTE_NONNULL(1);
- 
-+void
-+virDomainObjGetMessagesIOErrorsChain(virStorageSource *src,
-+                                     const char *diskdst,
-+                                     GPtrArray *m);
-+
- void
- virDomainObjGetMessages(virDomainObj *vm,
-                         GPtrArray *m,
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 43e2dfb9cd..7d404fdbf5 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -590,6 +590,7 @@ virDomainObjEndAPI;
- virDomainObjFormat;
- virDomainObjGetDefs;
- virDomainObjGetMessages;
-+virDomainObjGetMessagesIOErrorsChain;
- virDomainObjGetMetadata;
- virDomainObjGetOneDef;
- virDomainObjGetOneDefState;
-diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index 545d67de52..29dcee3cfc 100644
---- a/src/libxl/libxl_driver.c
-+++ b/src/libxl/libxl_driver.c
-@@ -6577,7 +6577,8 @@ libxlDomainGetMessages(virDomainPtr dom,
-     int ret = -1;
- 
-     virCheckFlags(VIR_DOMAIN_MESSAGE_DEPRECATION |
--                  VIR_DOMAIN_MESSAGE_TAINTING, -1);
-+                  VIR_DOMAIN_MESSAGE_TAINTING |
-+                  VIR_DOMAIN_MESSAGE_IOERRORS, -1);
- 
-     if (!(vm = libxlDomObjFromDomain(dom)))
-         return -1;
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 276a7caded..9a69574f31 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -19814,9 +19814,11 @@ qemuDomainGetMessages(virDomainPtr dom,
-     g_autoptr(GPtrArray) m = g_ptr_array_new_with_free_func(g_free);
-     virDomainObj *vm = NULL;
-     int rv = -1;
-+    qemuDomainObjPrivate *priv;
- 
-     virCheckFlags(VIR_DOMAIN_MESSAGE_DEPRECATION |
--                  VIR_DOMAIN_MESSAGE_TAINTING, -1);
-+                  VIR_DOMAIN_MESSAGE_TAINTING |
-+                  VIR_DOMAIN_MESSAGE_IOERRORS, -1);
- 
-     if (!(vm = qemuDomainObjFromDomain(dom)))
-         return -1;
-@@ -19824,8 +19826,20 @@ qemuDomainGetMessages(virDomainPtr dom,
-     if (virDomainGetMessagesEnsureACL(dom->conn, vm->def) < 0)
-         goto cleanup;
- 
-+    priv = vm->privateData;
-+
-     virDomainObjGetMessages(vm, m, flags);
- 
-+    if (priv->backup &&
-+        (!flags || (flags & VIR_DOMAIN_MESSAGE_IOERRORS))) {
-+        size_t i;
-+
-+        for (i = 0; i < priv->backup->ndisks; i++)
-+            virDomainObjGetMessagesIOErrorsChain(priv->backup->disks[i].store,
-+                                                 priv->backup->disks[i].name,
-+                                                 m);
-+    }
-+
-     rv = m->len;
-     if (m->len > 0) {
-         g_ptr_array_add(m, NULL);
-diff --git a/src/test/test_driver.c b/src/test/test_driver.c
-index a10ec3bc41..6f18b2b2c8 100644
---- a/src/test/test_driver.c
-+++ b/src/test/test_driver.c
-@@ -9527,7 +9527,8 @@ testDomainGetMessages(virDomainPtr dom,
-     int rv = -1;
- 
-     virCheckFlags(VIR_DOMAIN_MESSAGE_DEPRECATION |
--                  VIR_DOMAIN_MESSAGE_TAINTING, -1);
-+                  VIR_DOMAIN_MESSAGE_TAINTING |
-+                  VIR_DOMAIN_MESSAGE_IOERRORS, -1);
- 
-     if (!(vm = testDomObjFromDomain(dom)))
-         return -1;
--- 
-2.48.1
diff --git a/SOURCES/libvirt-virDomainObjGetMessages-Refactor-using-GPtrArray.patch b/SOURCES/libvirt-virDomainObjGetMessages-Refactor-using-GPtrArray.patch
deleted file mode 100644
index a686035..0000000
--- a/SOURCES/libvirt-virDomainObjGetMessages-Refactor-using-GPtrArray.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From d3ebbc9040b3f58dcf790a6d53f09c2eb5119bfd Mon Sep 17 00:00:00 2001
-Message-ID: <d3ebbc9040b3f58dcf790a6d53f09c2eb5119bfd.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 27 Jan 2025 17:38:51 +0100
-Subject: [PATCH] virDomainObjGetMessages: Refactor using GPtrArray
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Simplify the function especially by rewriting it using GPtrArray to
-construct the string list, especially for the upcoming case when the
-number of added elements will not be known beforehand and when
-hypervisor specific data will be added.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 1a02760cc6d79422dc4dd17b943915cd0ac15987)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/conf/domain_conf.c   | 36 +++++++-----------------------------
- src/conf/domain_conf.h   |  4 ++--
- src/libxl/libxl_driver.c |  9 ++++++++-
- src/qemu/qemu_driver.c   |  9 ++++++++-
- src/test/test_driver.c   |  9 ++++++++-
- 5 files changed, 33 insertions(+), 34 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index d3f30b08dc..8cd0fb83b6 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -31646,53 +31646,31 @@ virHostdevIsPCIDevice(const virDomainHostdevDef *hostdev)
- /**
-  * virDomainObjGetMessages:
-  * @vm: domain object
-- * @msgs: pointer to a variable to store messages
-+ * @m: GPtrArray to be filled with messages
-  * @flags: zero or more virDomainMessageType flags
-- *
-- * Returns number of messages stored in @msgs, -1 otherwise.
-  */
--int
-+void
- virDomainObjGetMessages(virDomainObj *vm,
--                        char ***msgs,
-+                        GPtrArray *m,
-                         unsigned int flags)
- {
-     size_t i = 0;
--    size_t n = 0;
--    int nmsgs = 0;
--    int rv = -1;
--
--    *msgs = NULL;
- 
-     if (!flags || (flags & VIR_DOMAIN_MESSAGE_TAINTING)) {
--        nmsgs += __builtin_popcount(vm->taint);
--        *msgs = g_renew(char *, *msgs, nmsgs+1);
--
-         for (i = 0; i < VIR_DOMAIN_TAINT_LAST; i++) {
-             if (vm->taint & (1 << i)) {
--                (*msgs)[n++] = g_strdup_printf(
--                    _("tainted: %1$s"),
--                    _(virDomainTaintMessageTypeToString(i)));
-+                g_ptr_array_add(m, g_strdup_printf(_("tainted: %1$s"),
-+                                                   _(virDomainTaintMessageTypeToString(i))));
-             }
-         }
-     }
- 
-     if (!flags || (flags & VIR_DOMAIN_MESSAGE_DEPRECATION)) {
--        nmsgs += vm->ndeprecations;
--        *msgs = g_renew(char *, *msgs, nmsgs+1);
--
-         for (i = 0; i < vm->ndeprecations; i++) {
--            (*msgs)[n++] = g_strdup_printf(
--                _("deprecated configuration: %1$s"),
--                vm->deprecations[i]);
-+            g_ptr_array_add(m, g_strdup_printf(_("deprecated configuration: %1$s"),
-+                                               vm->deprecations[i]));
-         }
-     }
--
--    if (*msgs)
--        (*msgs)[nmsgs] = NULL;
--
--    rv = nmsgs;
--
--    return rv;
- }
- 
- bool
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 9f7c28343f..7058203e67 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -4576,9 +4576,9 @@ bool
- virHostdevIsPCIDevice(const virDomainHostdevDef *hostdev)
-     ATTRIBUTE_NONNULL(1);
- 
--int
-+void
- virDomainObjGetMessages(virDomainObj *vm,
--                        char ***msgs,
-+                        GPtrArray *m,
-                         unsigned int flags);
- 
- bool
-diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index 26d22550ae..545d67de52 100644
---- a/src/libxl/libxl_driver.c
-+++ b/src/libxl/libxl_driver.c
-@@ -6572,6 +6572,7 @@ libxlDomainGetMessages(virDomainPtr dom,
-                       char ***msgs,
-                       unsigned int flags)
- {
-+    g_autoptr(GPtrArray) m = g_ptr_array_new_with_free_func(g_free);
-     virDomainObj *vm = NULL;
-     int ret = -1;
- 
-@@ -6584,7 +6585,13 @@ libxlDomainGetMessages(virDomainPtr dom,
-     if (virDomainGetMessagesEnsureACL(dom->conn, vm->def) < 0)
-         goto cleanup;
- 
--    ret = virDomainObjGetMessages(vm, msgs, flags);
-+    virDomainObjGetMessages(vm, m, flags);
-+
-+    ret = m->len;
-+    if (m->len > 0) {
-+        g_ptr_array_add(m, NULL);
-+        *msgs = (char **) g_ptr_array_steal(m, NULL);
-+    }
- 
-  cleanup:
-     virDomainObjEndAPI(&vm);
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 09f7edda7d..276a7caded 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -19811,6 +19811,7 @@ qemuDomainGetMessages(virDomainPtr dom,
-                       char ***msgs,
-                       unsigned int flags)
- {
-+    g_autoptr(GPtrArray) m = g_ptr_array_new_with_free_func(g_free);
-     virDomainObj *vm = NULL;
-     int rv = -1;
- 
-@@ -19823,7 +19824,13 @@ qemuDomainGetMessages(virDomainPtr dom,
-     if (virDomainGetMessagesEnsureACL(dom->conn, vm->def) < 0)
-         goto cleanup;
- 
--    rv = virDomainObjGetMessages(vm, msgs, flags);
-+    virDomainObjGetMessages(vm, m, flags);
-+
-+    rv = m->len;
-+    if (m->len > 0) {
-+        g_ptr_array_add(m, NULL);
-+        *msgs = (char **) g_ptr_array_steal(m, NULL);
-+    }
- 
-  cleanup:
-     virDomainObjEndAPI(&vm);
-diff --git a/src/test/test_driver.c b/src/test/test_driver.c
-index f1cefb5c50..a10ec3bc41 100644
---- a/src/test/test_driver.c
-+++ b/src/test/test_driver.c
-@@ -9522,6 +9522,7 @@ testDomainGetMessages(virDomainPtr dom,
-                       char ***msgs,
-                       unsigned int flags)
- {
-+    g_autoptr(GPtrArray) m = g_ptr_array_new_with_free_func(g_free);
-     virDomainObj *vm = NULL;
-     int rv = -1;
- 
-@@ -9531,7 +9532,13 @@ testDomainGetMessages(virDomainPtr dom,
-     if (!(vm = testDomObjFromDomain(dom)))
-         return -1;
- 
--    rv = virDomainObjGetMessages(vm, msgs, flags);
-+    virDomainObjGetMessages(vm, m, flags);
-+
-+    rv = m->len;
-+    if (m->len > 0) {
-+        g_ptr_array_add(m, NULL);
-+        *msgs = (char **) g_ptr_array_steal(m, NULL);
-+    }
- 
-     virDomainObjEndAPI(&vm);
-     return rv;
--- 
-2.48.1
diff --git a/SOURCES/libvirt-virDomainSnapshotDefAssignExternalNames-Improve-error-message.patch b/SOURCES/libvirt-virDomainSnapshotDefAssignExternalNames-Improve-error-message.patch
new file mode 100644
index 0000000..8b9427e
--- /dev/null
+++ b/SOURCES/libvirt-virDomainSnapshotDefAssignExternalNames-Improve-error-message.patch
@@ -0,0 +1,37 @@
+From 75176aff12076de0511a3cc46ad820255a0d05f0 Mon Sep 17 00:00:00 2001
+Message-ID: <75176aff12076de0511a3cc46ad820255a0d05f0.1769699807.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 26 Jan 2026 16:39:45 +0100
+Subject: [PATCH] virDomainSnapshotDefAssignExternalNames: Improve error
+ message
+
+Mention the 'path' where the detection failed as well as include the
+possibility that the 'path' doesn't exist in the message itself.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit f1ad5219368b1b2c603d876f28dc852fd6da3a8d)
+
+ https://issues.redhat.com/browse/RHEL-144089 [rhel-10.2]
+ https://issues.redhat.com/browse/RHEL-144090 [rhel-9.8]
+---
+ src/conf/snapshot_conf.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
+index 039ed77b84..4309667a34 100644
+--- a/src/conf/snapshot_conf.c
++++ b/src/conf/snapshot_conf.c
+@@ -541,8 +541,8 @@ virDomainSnapshotDefAssignExternalNames(virDomainSnapshotDef *def,
+ 
+         if (stat(origpath, &sb) < 0 || !S_ISREG(sb.st_mode)) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+-                           _("source for disk '%1$s' is not a regular file; refusing to generate external snapshot name"),
+-                           disk->name);
++                           _("source for disk '%1$s' (%2$s) doesn't exist or is not a regular file; refusing to generate external snapshot name"),
++                           disk->name, origpath);
+             return -1;
+         }
+ 
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-virNodeGetInfo-Improve-description-of-the-case-when-fake-data-is-reported.patch b/SOURCES/libvirt-virNodeGetInfo-Improve-description-of-the-case-when-fake-data-is-reported.patch
deleted file mode 100644
index 45c9501..0000000
--- a/SOURCES/libvirt-virNodeGetInfo-Improve-description-of-the-case-when-fake-data-is-reported.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 26445297c5b24bd539ec52525b748f86e82dcc52 Mon Sep 17 00:00:00 2001
-Message-ID: <26445297c5b24bd539ec52525b748f86e82dcc52.1744876587.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 7 Apr 2025 14:33:01 +0200
-Subject: [PATCH] virNodeGetInfo: Improve description of the case when fake
- data is reported
-
-virNodeGetInfo due to the rigid desing of the filled struct can't
-faithfully represent all topologies. Improve the description when that
-happens and outline the fallback topology.
-
-The function docs already state that users ought to use
-virConnectGetCapabilities() instead.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 6654cf472c7a8c3e0294012b7c249fc427207759)
-
-https://issues.redhat.com/browse/RHEL-86197
----
- src/libvirt-host.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/libvirt-host.c b/src/libvirt-host.c
-index 318a664d24..b9c717be11 100644
---- a/src/libvirt-host.c
-+++ b/src/libvirt-host.c
-@@ -414,10 +414,13 @@ virConnectGetMaxVcpus(virConnectPtr conn,
-  * speed that the first CPU in the machine is currently running at. This speed
-  * may vary across CPUs and changes continually as the host OS throttles.
-  *
-- * The nodes/sockets/cores/threads data is potentially inaccurate as
-- * it assumes a symmetric installation. If one NUMA node has more
-- * sockets populated that another NUMA node this information will be
-- * wrong. It is also not able to report about CPU dies.
-+ * The virNodeInfo structure is not extensible thus only supports global
-+ * nodes/sockets/cores/threads (sockets/cores/threads is per NUMA node)
-+ * topology information. If the host CPU has any further groupings (e.g.
-+ * dies, clusters, etc) or the NUMA topology is non-symmetrical the structure
-+ * can't faithfully represent the system. In such cases a fake topology
-+ * (nodes = 1, sockets = 1, cores = number of host cpus, threads = 1) which
-+ * only correctly represents the total host CPU count is reported.
-  *
-  * Applications are recommended to use the virConnectGetCapabilities()
-  * call instead, which provides all the information except CPU frequency,
--- 
-2.49.0
diff --git a/SOURCES/libvirt-virStorageSource-Add-fields-for-storing-last-I-O-error-message.patch b/SOURCES/libvirt-virStorageSource-Add-fields-for-storing-last-I-O-error-message.patch
deleted file mode 100644
index cac6ae1..0000000
--- a/SOURCES/libvirt-virStorageSource-Add-fields-for-storing-last-I-O-error-message.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 1e47a795e7a06152cfd8b6d7c80692875d2e00b9 Mon Sep 17 00:00:00 2001
-Message-ID: <1e47a795e7a06152cfd8b6d7c80692875d2e00b9.1738940191.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 27 Jan 2025 16:20:43 +0100
-Subject: [PATCH] virStorageSource: Add fields for storing last I/O error
- message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Hypervisors may report a I/O error message (unstable; for human use)
-to libvirt. In order to store it with the appropriate virStorageSource
-so that it can be later queried we need to add fields to
-virStorageSource to store the timestamp and message.
-
-The message is deliberately not copied via virStorageSourceCopy.
-
-The messages are also not serialized to the status XML as losing them on
-a daemon restart as they're likely to be stale anyways.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 2f6c9fa4f6f4c0a36ffc2b24892eee78e1e4cf53)
-
-https://issues.redhat.com/browse/RHEL-77884
----
- src/conf/storage_source_conf.c | 5 +++++
- src/conf/storage_source_conf.h | 6 ++++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c
-index 2b658dd485..ca956a1b7c 100644
---- a/src/conf/storage_source_conf.c
-+++ b/src/conf/storage_source_conf.c
-@@ -917,6 +917,8 @@ virStorageSourceCopy(const virStorageSource *src,
-     def->nfs_uid = src->nfs_uid;
-     def->nfs_gid = src->nfs_gid;
- 
-+    /* 'ioerror_timestamp' and 'ioerror_message' are deliberately not copied */
-+
-     return g_steal_pointer(&def);
- }
- 
-@@ -1203,6 +1205,9 @@ virStorageSourceClear(virStorageSource *def)
- 
-     g_clear_pointer(&def->fdtuple, g_object_unref);
- 
-+    VIR_FREE(def->ioerror_timestamp);
-+    VIR_FREE(def->ioerror_message);
-+
-     /* clear everything except the class header as the object APIs
-      * will break otherwise */
-     memset((char *) def + sizeof(def->parent), 0,
-diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h
-index 9463722518..e6cbb93c06 100644
---- a/src/conf/storage_source_conf.h
-+++ b/src/conf/storage_source_conf.h
-@@ -445,6 +445,12 @@ struct _virStorageSource {
-      * to do this decision.
-      */
-     bool seclabelSkipRemember;
-+
-+    /* Last instance of hypervisor originated I/O error message and timestamp.
-+     * The error stored here is not designed to be stable. The message
-+     * is also not copied via virStorageSourceCopy */
-+    char *ioerror_timestamp;
-+    char *ioerror_message;
- };
- 
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStorageSource, virObjectUnref);
--- 
-2.48.1
diff --git a/SOURCES/libvirt-virjsontest-Add-test-for-nesting-depth.patch b/SOURCES/libvirt-virjsontest-Add-test-for-nesting-depth.patch
new file mode 100644
index 0000000..19eb6cb
--- /dev/null
+++ b/SOURCES/libvirt-virjsontest-Add-test-for-nesting-depth.patch
@@ -0,0 +1,45 @@
+From ee409902d270d19ae1c7a1fc3e0af67320bdb26b Mon Sep 17 00:00:00 2001
+Message-ID: <ee409902d270d19ae1c7a1fc3e0af67320bdb26b.1768317034.git.jdenemar@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 5 Jan 2026 15:00:18 +0100
+Subject: [PATCH] virjsontest: Add test for nesting depth
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add an example of 250 layer deep nested JSON to make sure the parser
+supports it. This is in order to maintain compatibility with external
+snapshots in qemu, where such a deeply nested document is returned with
+a 'query-block' QMP call.
+
+I've used a fake JSON as a real reply from qemu is around 1.4MiB for a
+200 deep image chain.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 16804acf14616d7357ad6a336f2ffd6d255a8d63)
+https://issues.redhat.com/browse/RHEL-135128
+---
+ tests/virjsondata/parse-nesting-in.json  | 1 +
+ tests/virjsondata/parse-nesting-out.json | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 tests/virjsondata/parse-nesting-in.json
+ create mode 120000 tests/virjsondata/parse-nesting-out.json
+
+diff --git a/tests/virjsondata/parse-nesting-in.json b/tests/virjsondata/parse-nesting-in.json
+new file mode 100644
+index 0000000000..8bbe1a3439
+--- /dev/null
++++ b/tests/virjsondata/parse-nesting-in.json
+@@ -0,0 +1 @@
++{"n249": {"n248": {"n247": {"n246": {"n245": {"n244": {"n243": {"n242": {"n241": {"n240": {"n239": {"n238": {"n237": {"n236": {"n235": {"n234": {"n233": {"n232": {"n231": {"n230": {"n229": {"n228": {"n227": {"n226": {"n225": {"n224": {"n223": {"n222": {"n221": {"n220": {"n219": {"n218": {"n217": {"n216": {"n215": {"n214": {"n213": {"n212": {"n211": {"n210": {"n209": {"n208": {"n207": {"n206": {"n205": {"n204": {"n203": {"n202": {"n201": {"n200": {"n199": {"n198": {"n197": {"n196": {"n195": {"n194": {"n193": {"n192": {"n191": {"n190": {"n189": {"n188": {"n187": {"n186": {"n185": {"n184": {"n183": {"n182": {"n181": {"n180": {"n179": {"n178": {"n177": {"n176": {"n175": {"n174": {"n173": {"n172": {"n171": {"n170": {"n169": {"n168": {"n167": {"n166": {"n165": {"n164": {"n163": {"n162": {"n161": {"n160": {"n159": {"n158": {"n157": {"n156": {"n155": {"n154": {"n153": {"n152": {"n151": {"n150": {"n149": {"n148": {"n147": {"n146": {"n145": {"n144": {"n143": {"n142": {"n141": {"n140": {"n139": {"n138": {"n137": {"n136": {"n135": {"n134": {"n133": {"n132": {"n131": {"n130": {"n129": {"n128": {"n127": {"n126": {"n125": {"n124": {"n123": {"n122": {"n121": {"n120": {"n119": {"n118": {"n117": {"n116": {"n115": {"n114": {"n113": {"n112": {"n111": {"n110": {"n109": {"n108": {"n107": {"n106": {"n105": {"n104": {"n103": {"n102": {"n101": {"n100": {"n99": {"n98": {"n97": {"n96": {"n95": {"n94": {"n93": {"n92": {"n91": {"n90": {"n89": {"n88": {"n87": {"n86": {"n85": {"n84": {"n83": {"n82": {"n81": {"n80": {"n79": {"n78": {"n77": {"n76": {"n75": {"n74": {"n73": {"n72": {"n71": {"n70": {"n69": {"n68": {"n67": {"n66": {"n65": {"n64": {"n63": {"n62": {"n61": {"n60": {"n59": {"n58": {"n57": {"n56": {"n55": {"n54": {"n53": {"n52": {"n51": {"n50": {"n49": {"n48": {"n47": {"n46": {"n45": {"n44": {"n43": {"n42": {"n41": {"n40": {"n39": {"n38": {"n37": {"n36": {"n35": {"n34": {"n33": {"n32": {"n31": {"n30": {"n29": {"n28": {"n27": {"n26": {"n25": {"n24": {"n23": {"n22": {"n21": {"n20": {"n19": {"n18": {"n17": {"n16": {"n15": {"n14": {"n13": {"n12": {"n11": {"n10": {"n9": {"n8": {"n7": {"n6": {"n5": {"n4": {"n3": {"n2": {"n1": {"n0": "end"}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+diff --git a/tests/virjsondata/parse-nesting-out.json b/tests/virjsondata/parse-nesting-out.json
+new file mode 120000
+index 0000000000..d269172843
+--- /dev/null
++++ b/tests/virjsondata/parse-nesting-out.json
+@@ -0,0 +1 @@
++parse-nesting-in.json
+\ No newline at end of file
+-- 
+2.52.0
diff --git a/SOURCES/libvirt-virsh-Add-support-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch b/SOURCES/libvirt-virsh-Add-support-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch
deleted file mode 100644
index 05f149e..0000000
--- a/SOURCES/libvirt-virsh-Add-support-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 4452c8f1b0a9e953615d15d02ada49c1834c72d5 Mon Sep 17 00:00:00 2001
-Message-ID: <4452c8f1b0a9e953615d15d02ada49c1834c72d5.1747908717.git.jdenemar@redhat.com>
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Tue, 25 Feb 2025 15:22:35 +0100
-Subject: [PATCH] virsh: Add support for VIR_DOMAIN_GUEST_INFO_LOAD
-
-Resolves: https://issues.redhat.com/browse/RHEL-71883
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 71e75ce09203aa2489803426ae368d1693ee925b)
-
-https://issues.redhat.com/browse/RHEL-88447
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
----
- docs/manpages/virsh.rst | 8 +++++++-
- tools/virsh-domain.c    | 6 ++++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
-index aea920b7a7..2bb1313a48 100644
---- a/docs/manpages/virsh.rst
-+++ b/docs/manpages/virsh.rst
-@@ -2927,7 +2927,7 @@ Success is always reported in this case.
- 
- You can limit the types of information that are returned by specifying one or
- more flags.  Available information types flags are *--user*, *--os*,
--*--timezone*, *--hostname*, *--filesystem*, *--disk* and *--interface*.
-+*--timezone*, *--hostname*, *--filesystem*, *--disk*, *--interface* and *--load*.
- If an explicitly requested information type is not supported by the guest agent
- at that point, the processes will provide an exit code of 1.
- 
-@@ -3006,6 +3006,12 @@ returned:
- * ``if.<num>.addr.<num1>.addr`` - the IP address of addr <num1>
- * ``if.<num>.addr.<num1>.prefix`` - the prefix of IP address of addr <num1>
- 
-+*--load* returns:
-+* ``load.1m``  - average load in guest for last 1 minute
-+* ``load.5m``  - average load in guest for last 5 minutes
-+* ``load.15m`` - average load in guest for last 15 minutes
-+
-+
- guestvcpus
- ----------
- 
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index e4923284af..0f30a65fd9 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -13066,6 +13066,10 @@ static const vshCmdOptDef opts_guestinfo[] = {
-      .type = VSH_OT_BOOL,
-      .help = N_("report interface information"),
-     },
-+    {.name = "load",
-+     .type = VSH_OT_BOOL,
-+     .help = N_("report load averages information"),
-+    },
-     {.name = NULL}
- };
- 
-@@ -13093,6 +13097,8 @@ cmdGuestInfo(vshControl *ctl, const vshCmd *cmd)
-         types |= VIR_DOMAIN_GUEST_INFO_DISKS;
-     if (vshCommandOptBool(cmd, "interface"))
-         types |= VIR_DOMAIN_GUEST_INFO_INTERFACES;
-+    if (vshCommandOptBool(cmd, "load"))
-+        types |= VIR_DOMAIN_GUEST_INFO_LOAD;
- 
-     if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
-         return false;
--- 
-2.49.0
diff --git a/SOURCES/libvirt-virsh-Introduce-new-hypervisor-cpu-models-command.patch b/SOURCES/libvirt-virsh-Introduce-new-hypervisor-cpu-models-command.patch
deleted file mode 100644
index 86c9466..0000000
--- a/SOURCES/libvirt-virsh-Introduce-new-hypervisor-cpu-models-command.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 1d5f1c125cbe567b5586ff661e6b030f7f7f4151 Mon Sep 17 00:00:00 2001
-Message-ID: <1d5f1c125cbe567b5586ff661e6b030f7f7f4151.1747908718.git.jdenemar@redhat.com>
-From: David Judkovics <djudkovi(a)linux.ibm.com>
-Date: Thu, 20 Mar 2025 01:28:24 -0400
-Subject: [PATCH] virsh: Introduce new hypervisor-cpu-models command
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add new virsh command 'hypervisor-cpu-models'.  Command pulls from the
-existing domcapabilities XML and uses xpath to parse CPU model strings.
-By default, only models reported as usable by the hypervisor on the
-host system are printed.  User may specify "--all" to also print
-models which are not supported on the host.
-
-Signed-off-by: David Judkovics <djudkovi@linux.ibm.com>
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Signed-off-by: Collin Walling <walling@linux.ibm.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 65eeaf12d0780d20fcd7b76479d892c50f56a78c)
-
-https://issues.redhat.com/browse/RHEL-11435
-
-Signed-off-by: Boris Fiuczynski <bfiuczyn@redhat.com>
----
- docs/manpages/virsh.rst | 25 ++++++++++++++
- tools/virsh-host.c      | 75 +++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 100 insertions(+)
-
-diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
-index 2bb1313a48..4d86caecd6 100644
---- a/docs/manpages/virsh.rst
-+++ b/docs/manpages/virsh.rst
-@@ -1032,6 +1032,31 @@ listed in the XML description. If *--migratable* is specified, features that
- block migration will not be included in the resulting CPU.
- 
- 
-+hypervisor-cpu-models
-+---------------------
-+
-+**Syntax:**
-+
-+::
-+
-+   hypervisor-cpu-models [--virttype virttype] [--emulator emulator]
-+      [--arch arch] [--machine machine] [--all]
-+
-+Print the list of CPU models known by the hypervisor for the specified architecture.
-+It is not guaranteed that a listed CPU will run on the host. To determine CPU
-+model compatibility with the host, see ``virsh hypervisor-cpu-baseline`` and
-+``virsh hypervisor-cpu-compare``.
-+
-+The *virttype* option specifies the virtualization type (usable in the 'type'
-+attribute of the <domain> top level element from the domain XML). *emulator*
-+specifies the path to the emulator, *arch* specifies the CPU architecture, and
-+*machine* specifies the machine type.
-+
-+By default, only the models that are claimed to be "usable" by the hypervisor
-+on the host are reported. The option *--all* will report every CPU model known
-+to the hypervisor, including ones that are not supported on the hypervisor (e.g.
-+newer generation models).
-+
- DOMAIN COMMANDS
- ===============
- 
-diff --git a/tools/virsh-host.c b/tools/virsh-host.c
-index 2fe64e415f..eac782f2d4 100644
---- a/tools/virsh-host.c
-+++ b/tools/virsh-host.c
-@@ -1751,6 +1751,75 @@ cmdHypervisorCPUBaseline(vshControl *ctl,
- }
- 
- 
-+/*
-+ * "hypervisor-cpu-models" command
-+ */
-+static const vshCmdInfo info_hypervisor_cpu_models = {
-+    .help = N_("Hypervisor reported CPU models"),
-+    .desc = N_("Get the CPU models reported by the hypervisor."),
-+};
-+
-+static const vshCmdOptDef opts_hypervisor_cpu_models[] = {
-+    {.name = "virttype",
-+     .type = VSH_OT_STRING,
-+     .completer = virshDomainVirtTypeCompleter,
-+     .help = N_("virtualization type (/domain/@type)"),
-+    },
-+    {.name = "emulator",
-+     .type = VSH_OT_STRING,
-+     .help = N_("path to emulator binary (/domain/devices/emulator)"),
-+    },
-+    {.name = "arch",
-+     .type = VSH_OT_STRING,
-+     .completer = virshArchCompleter,
-+     .help = N_("CPU architecture (/domain/os/type/@arch)"),
-+    },
-+    {.name = "machine",
-+     .type = VSH_OT_STRING,
-+     .help = N_("machine type (/domain/os/type/@machine)"),
-+    },
-+    {.name = "all",
-+     .type = VSH_OT_BOOL,
-+     .help = N_("include all CPU models known to the hypervisor for the architecture")
-+    },
-+    {.name = NULL}
-+};
-+
-+static bool
-+cmdHypervisorCPUModelNames(vshControl *ctl,
-+                           const vshCmd *cmd)
-+{
-+    g_autofree char *caps_xml = NULL;
-+    const char *virttype = NULL;
-+    const char *emulator = NULL;
-+    const char *arch = NULL;
-+    const char *machine = NULL;
-+    const char *xpath = NULL;
-+    virshControl *priv = ctl->privData;
-+
-+    if (vshCommandOptString(ctl, cmd, "virttype", &virttype) < 0 ||
-+        vshCommandOptString(ctl, cmd, "emulator", &emulator) < 0 ||
-+        vshCommandOptString(ctl, cmd, "arch", &arch) < 0 ||
-+        vshCommandOptString(ctl, cmd, "machine", &machine) < 0)
-+        return false;
-+
-+    if (vshCommandOptBool(cmd, "all"))
-+        xpath = "//cpu//model[@usable]/text()";
-+    else
-+        xpath = "//cpu//model[@usable='yes']/text()";
-+
-+    caps_xml = virConnectGetDomainCapabilities(priv->conn, emulator, arch,
-+                                               machine, virttype, 0);
-+
-+    if (!caps_xml) {
-+        vshError(ctl, "%s", _("failed to get hypervisor CPU model names"));
-+        return false;
-+    }
-+
-+    return virshDumpXML(ctl, caps_xml, "domcapabilities", xpath, false);
-+}
-+
-+
- const vshCmdDef hostAndHypervisorCmds[] = {
-     {.name = "allocpages",
-      .handler = cmdAllocpages,
-@@ -1818,6 +1887,12 @@ const vshCmdDef hostAndHypervisorCmds[] = {
-      .info = &info_hypervisor_cpu_compare,
-      .flags = 0
-     },
-+    {.name = "hypervisor-cpu-models",
-+     .handler = cmdHypervisorCPUModelNames,
-+     .opts = opts_hypervisor_cpu_models,
-+     .info = &info_hypervisor_cpu_models,
-+     .flags = 0
-+    },
-     {.name = "maxvcpus",
-      .handler = cmdMaxvcpus,
-      .opts = opts_maxvcpus,
--- 
-2.49.0
diff --git a/SOURCES/libvirt-virsh-add-disable-deprecated-features-flag-to-domcapabilities.patch b/SOURCES/libvirt-virsh-add-disable-deprecated-features-flag-to-domcapabilities.patch
deleted file mode 100644
index 3bd91ee..0000000
--- a/SOURCES/libvirt-virsh-add-disable-deprecated-features-flag-to-domcapabilities.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 4983d6caf2064c48003a5d092c2d30a1132080ac Mon Sep 17 00:00:00 2001
-Message-ID: <4983d6caf2064c48003a5d092c2d30a1132080ac.1749039441.git.jdenemar@redhat.com>
-From: Collin Walling <walling@linux.ibm.com>
-Date: Mon, 16 Dec 2024 18:03:57 -0500
-Subject: [PATCH] virsh: add --disable-deprecated-features flag to
- domcapabilities
-
-Add a new flag, --disable-deprecated-features, to the domcapabilities
-command.  This will modify the output to show the 'host-model' CPU
-with features flagged as deprecated paired with the 'disable' policy.
-
-virsh domcapabilities --disable-deprecated-features
-
-Signed-off-by: Collin Walling <walling@linux.ibm.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 15d45964e453e04f1761e527266af45554f58fcc)
-JIRA: https://issues.redhat.com/browse/RHEL-89415
-Signed-off-by: Thomas Huth <thuth@redhat.com>
----
- docs/manpages/virsh.rst | 6 ++++++
- tools/virsh-host.c      | 9 ++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
-index 4d86caecd6..b75e00beb6 100644
---- a/docs/manpages/virsh.rst
-+++ b/docs/manpages/virsh.rst
-@@ -583,6 +583,7 @@ domcapabilities
- 
-    domcapabilities [virttype] [emulatorbin] [arch] [machine]
-                    [--xpath EXPRESSION] [--wrap]
-+                   [--disable-deprecated-features]
- 
- 
- Print an XML document describing the domain capabilities for the
-@@ -624,6 +625,11 @@ a standalone document, however, for ease of additional processing,
- the **--wrap** argument will cause the matching node to be wrapped
- in a common root node.
- 
-+The **--disable-deprecated-features** argument will modify the contents
-+of host-model CPU XML, updating the features list with any features
-+flagged as deprecated for the CPU model by the hypervisor. These
-+features will be paired with the "disable" policy.
-+
- 
- pool-capabilities
- -----------------
-diff --git a/tools/virsh-host.c b/tools/virsh-host.c
-index eac782f2d4..9a2b689620 100644
---- a/tools/virsh-host.c
-+++ b/tools/virsh-host.c
-@@ -114,6 +114,10 @@ static const vshCmdOptDef opts_domcapabilities[] = {
-      .type = VSH_OT_BOOL,
-      .help = N_("wrap xpath results in an common root element"),
-     },
-+    {.name = "disable-deprecated-features",
-+     .type = VSH_OT_BOOL,
-+     .help = N_("report host CPU model with deprecated features disabled"),
-+    },
-     {.name = NULL}
- };
- 
-@@ -126,10 +130,13 @@ cmdDomCapabilities(vshControl *ctl, const vshCmd *cmd)
-     const char *arch = NULL;
-     const char *machine = NULL;
-     const char *xpath = NULL;
--    const unsigned int flags = 0; /* No flags so far */
-+    unsigned int flags = 0;
-     bool wrap = vshCommandOptBool(cmd, "wrap");
-     virshControl *priv = ctl->privData;
- 
-+    if (vshCommandOptBool(cmd, "disable-deprecated-features"))
-+        flags |= VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES;
-+
-     if (vshCommandOptString(ctl, cmd, "virttype", &virttype) < 0 ||
-         vshCommandOptString(ctl, cmd, "emulatorbin", &emulatorbin) < 0 ||
-         vshCommandOptString(ctl, cmd, "arch", &arch) < 0 ||
--- 
-2.49.0
diff --git a/SOURCES/libvirt-virstoragetest-Add-case-for-qcow2-image-with-empty-string-as-data_file.patch b/SOURCES/libvirt-virstoragetest-Add-case-for-qcow2-image-with-empty-string-as-data_file.patch
deleted file mode 100644
index e7dd1ee..0000000
--- a/SOURCES/libvirt-virstoragetest-Add-case-for-qcow2-image-with-empty-string-as-data_file.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From f8f48ce493edee78cd499c0aa3630d8d678b43a0 Mon Sep 17 00:00:00 2001
-Message-ID: <f8f48ce493edee78cd499c0aa3630d8d678b43a0.1737731143.git.jdenemar@redhat.com>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 9 Jan 2025 15:18:58 +0100
-Subject: [PATCH] virstoragetest: Add case for qcow2 image with empty string as
- 'data_file'
-
-Add an example image formatted by:
-
- qemu-img create -f qcow2 -o data_file=nbd+unix:///datafile?socket=/tmp/nbd,data_file_raw=true /tmp/nbddatastore.qcow2 10M -u
-
-serving as an example when qemu records an empty string as the
-'data_file' field.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit e6a4245d2a4db3857cfb38d4d3c4e3e0bcff6587)
-
-https://issues.redhat.com/browse/RHEL-73504
----
- tests/virstoragetest.c                         |   5 +++++
- .../images/datafile-emptystr.qcow2             | Bin 0 -> 327680 bytes
- 2 files changed, 5 insertions(+)
- create mode 100644 tests/virstoragetestdata/images/datafile-emptystr.qcow2
-
-diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
-index 4ec837eefb..78dc644637 100644
---- a/tests/virstoragetest.c
-+++ b/tests/virstoragetest.c
-@@ -494,6 +494,11 @@ mymain(void)
-                abs_srcdir "/virstoragetestdata/images/qcow2datafile-datafile.qcow2",
-                VIR_STORAGE_FILE_QCOW2, EXP_PASS);
- 
-+    /* broken qcow2 with a 'data_file' which is an empty string */
-+    TEST_CHAIN("qcow2-datafile-broken",
-+               abs_srcdir "/virstoragetestdata/images/datafile-emptystr.qcow2",
-+               VIR_STORAGE_FILE_QCOW2, EXP_FAIL);
-+
-     /* Test various combinations of qcow2 images with missing 'backing_format' */
-     TEST_CHAIN("qcow2-qcow2_qcow2-qcow2_qcow2-auto",
-                abs_srcdir "/virstoragetestdata/images/qcow2_qcow2-qcow2_qcow2-auto.qcow2",
-diff --git a/tests/virstoragetestdata/images/datafile-emptystr.qcow2 b/tests/virstoragetestdata/images/datafile-emptystr.qcow2
-new file mode 100644
-index 0000000000000000000000000000000000000000..18fae8740b4d650252d9a20629ca6e4d04653692
-GIT binary patch
-literal 327680
-zcmeIuK}y3w6b9f)+5>omoWUCuL=fBvg6p(NG0>(VouYNsV+(F1sS&bCUEA*q4D;Un
-znPKMX{^2WxFbiWh=Q16-Nk17<=juF;&BtZGLDy@B{@vnv(am3HpD!UKrx1#&jmK<R
-z#UU~+S?${P(8Ry~k(TeVZ0mfJ6?x3Fb+suc516fX+omn|`)XHb@z_kKLzs8_*F{-m
-zkGEM_$F?f>69*(=lYbnuwp_1vhdNG0dudo!aho?6gFn)w&EK-oorfg=0000000000
-z00000000000000000000000000000000000000000000000000000000000000000
-z0D#NV%Mkzo0000000000000000000000000000000000000000000000000000000
-z000000000000000000000RFk;_X7X`00000000000000000000000000000000000
-z0000000000000000000000000000000000000000;EJ8PyU(xq0RR910000000000
-z00000000000000000000000000000000000000000000000000000000000000000
-z=$*U+000000000000000000000000000000000000000000000000000000000000
-V0000000000000000000Xgm1%)GK2sC
-
-literal 0
-HcmV?d00001
-
--- 
-2.48.1
diff --git a/SPECS/libvirt.spec b/SPECS/libvirt.spec
index 0c8491f..120c6ac 100644
--- a/SPECS/libvirt.spec
+++ b/SPECS/libvirt.spec
@@ -3,15 +3,15 @@
 # This spec file assumes you are building on a Fedora or RHEL version
 # that's still supported by the vendor. It may work on other distros
 # or versions, but no effort will be made to ensure that going forward.
-%define min_rhel 8
-%define min_fedora 37
+%define min_rhel 9
+%define min_fedora 41
 
-%define arches_qemu_kvm         %{ix86} x86_64 %{power64} %{arm} aarch64 s390x riscv64
+%define arches_qemu_kvm         %{ix86} x86_64 %{power64} aarch64 s390x riscv64
 %if 0%{?rhel}
-    %if 0%{?rhel} > 8
-        %define arches_qemu_kvm     x86_64 aarch64 s390x
+    %if 0%{?rhel} >= 10
+        %define arches_qemu_kvm     x86_64 aarch64 s390x riscv64
     %else
-        %define arches_qemu_kvm     x86_64 %{power64} aarch64 s390x
+        %define arches_qemu_kvm     x86_64 aarch64 s390x
     %endif
 %endif
 
@@ -29,12 +29,24 @@
 %define arches_zfs              %{arches_x86} %{power64} %{arm}
 %define arches_numactl          %{arches_x86} %{power64} aarch64 s390x
 %define arches_numad            %{arches_x86} %{power64} aarch64
+%define arches_ch               x86_64 aarch64
 
 # The hypervisor drivers that run in libvirtd
-%define with_qemu          0%{!?_without_qemu:1}
 %define with_lxc           0%{!?_without_lxc:1}
 %define with_libxl         0%{!?_without_libxl:1}
 %define with_vbox          0%{!?_without_vbox:1}
+%define with_ch            0%{!?_without_ch:1}
+
+%ifarch %{arches_64bit}
+    %define with_qemu      0%{!?_without_qemu:1}
+%else
+    # QEMU drops 32-bit in Fedora 44
+    %if 0%{?fedora} > 43
+        %define with_qemu  0
+    %else
+        %define with_qemu  0%{!?_without_qemu:1}
+    %endif
+%endif
 
 %ifarch %{arches_qemu_kvm}
     %define with_qemu_kvm      %{with_qemu}
@@ -42,6 +54,12 @@
     %define with_qemu_kvm      0
 %endif
 
+%if 0%{?fedora} >= 42
+    %define with_account_add 0
+%else
+    %define with_account_add 1
+%endif
+
 %define with_qemu_tcg      %{with_qemu}
 
 # RHEL disables TCG on all architectures
@@ -64,18 +82,13 @@
 
 %define with_storage_gluster 0%{!?_without_storage_gluster:1}
 %if 0%{?rhel}
-    # Glusterfs has been dropped in RHEL-9, and before that
-    # was only enabled on arches where KVM exists
-    %if 0%{?rhel} > 8
-        %define with_storage_gluster 0
-    %else
-        %ifnarch %{arches_qemu_kvm}
-            %define with_storage_gluster 0
-        %endif
-    %endif
+    # Glusterfs has been dropped in RHEL-9.
+    %define with_storage_gluster 0
 %endif
 
-# Fedora has zfs-fuse
+# On Fedora 43, the 'zfs-fuse' package was removed, but is obtainable via
+# other means. Build the backend, but it's no longer considered to be part
+# of 'daemon-driver-storage'.
 %if 0%{?fedora}
     %define with_storage_zfs      0%{!?_without_storage_zfs:1}
 %else
@@ -84,13 +97,12 @@
 
 %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
 # libiscsi has been dropped in RHEL-9
-%if 0%{?rhel} > 8
+%if 0%{?rhel}
     %define with_storage_iscsi_direct 0
 %endif
 
 # Other optional features
 %define with_numactl          0%{!?_without_numactl:1}
-%define with_userfaultfd_sysctl 0%{!?_without_userfaultfd_sysctl:1}
 
 # A few optional bits off by default, we enable later
 %define with_fuse             0
@@ -123,6 +135,9 @@
 %ifnarch %{arches_ceph}
     %define with_storage_rbd 0
 %endif
+%ifnarch %{arches_ch}
+    %define with_ch 0
+%endif
 
 # RHEL doesn't ship many hypervisor drivers
 %if 0%{?rhel}
@@ -132,14 +147,11 @@
     %define with_libxl 0
     %define with_hyperv 0
     %define with_lxc 0
+    %define with_ch 0
 %endif
 
 %define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
 
-%if 0%{?rhel} && 0%{?rhel} < 9
-    %define with_netcf 0%{!?_without_netcf:1}
-%endif
-
 # fuse is used to provide virtualized /proc for LXC
 %if %{with_lxc}
     %define with_fuse      0%{!?_without_fuse:1}
@@ -181,8 +193,7 @@
 # Right now that's not the case anywhere, but things should be fine by the time
 # Fedora 40 is released.
 %if %{with_qemu}
-    # rhel-8 lacks pidfd_open
-    %if 0%{?fedora} || 0%{?rhel} >= 9
+    %if 0%{?fedora} || 0%{?rhel}
         %define with_nbdkit 0%{!?_without_nbdkit:1}
 
         # setting 'with_nbdkit_config_default' must be done only when compiling
@@ -190,7 +201,7 @@
         #
         # TODO: add RHEL 9 once a minor release that contains the necessary SELinux
         #       bits exists (we only support the most recent minor release)
-        %if 0%{?fedora} >= 40
+        %if 0%{?fedora}
             %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:1}
         %endif
     %endif
@@ -201,13 +212,13 @@
 %endif
 
 %define with_modular_daemons 0
-%if 0%{?fedora} || 0%{?rhel} >= 9
+%if 0%{?fedora} || 0%{?rhel}
     %define with_modular_daemons 1
 %endif
 
 # Prefer nftables for future OS releases but keep using iptables
 # for existing ones
-%if 0%{?rhel} >= 10 || 0%{?fedora} >= 41
+%if 0%{?rhel} >= 10 || 0%{?fedora}
     %define prefer_nftables 1
     %define firewall_backend_priority nftables,iptables
 %else
@@ -259,12 +270,6 @@
     %define enable_werror -Dwerror=false -Dgit_werror=disabled
 %endif
 
-# Fedora and RHEL-9 are new enough to support /dev/userfaultfd, which
-# does not require enabling vm.unprivileged_userfaultfd sysctl.
-%if 0%{?fedora} || 0%{?rhel} >= 9
-    %define with_userfaultfd_sysctl 0
-%endif
-
 %define tls_priority "@LIBVIRT,SYSTEM"
 
 # libvirt 8.1.0 stops distributing any sysconfig files.
@@ -288,8 +293,8 @@
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 10.10.0
-Release: 15%{?dist}%{?extra_release}
+Version: 11.10.0
+Release: 12%{?dist}%{?extra_release}
 License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1
 URL: https://libvirt.org/
 
@@ -297,160 +302,83 @@ URL: https://libvirt.org/
     %define mainturl stable_updates/
 %endif
 Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz
-Patch1: libvirt-util-Fix-typo-in-virNetDevOpenvswitchInterfaceSetQos.patch
-Patch2: libvirt-qemu-tpm-do-not-update-profile-name-for-transient-domains.patch
-Patch3: libvirt-qemu-Enable-I-O-APIC-if-needed.patch
-Patch4: libvirt-cpu_map-Sort-data-files-in-meson.build.patch
-Patch5: libvirt-sync_qemu_models_i386-Update-meson.build.patch
-Patch6: libvirt-sync_qemu_models_i386-Generate-missing-v1-variants.patch
-Patch7: libvirt-cpu_map-Add-486-v1-CPU-model.patch
-Patch8: libvirt-cpu_map-Add-pentium-v1-CPU-model.patch
-Patch9: libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch
-Patch10: libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch
-Patch11: libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch
-Patch12: libvirt-cpu_map-Add-n270-v1-CPU-model.patch
-Patch13: libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch
-Patch14: libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch
-Patch15: libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch
-Patch16: libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch
-Patch17: libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch
-Patch18: libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch
-Patch19: libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch
-Patch20: libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch
-Patch21: libvirt-cpu_map-Add-athlon-v1-CPU-model.patch
-Patch22: libvirt-cpu_map-Add-phenom-v1-CPU-model.patch
-Patch23: libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch
-Patch24: libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch
-Patch25: libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch
-Patch26: libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch
-Patch27: libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch
-Patch28: libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch
-Patch29: libvirt-qemu-Enable-I-O-APIC-even-more-frequently.patch
-Patch30: libvirt-conf-docs-Add-support-for-direct-and-extended-tlbflush-features.patch
-Patch31: libvirt-qemu-Add-support-for-direct-and-extended-tlbflush-features.patch
-Patch32: libvirt-conf-refactor-hyperv-features-formatting.patch
-Patch33: libvirt-conf-Adjust-hyperv-tlbflush-formatting.patch
-Patch34: libvirt-qemu_migration-Do-not-consider-post-copy-active-in-postcopy-recover.patch
-Patch35: libvirt-qemu-allow-migration-of-guest-with-mdev-vGPU-to-VF-vGPU.patch
-Patch36: libvirt-storage_file-Refuse-qcow2-images-with-empty-string-as-data_file.patch
-Patch37: libvirt-virstoragetest-Add-case-for-qcow2-image-with-empty-string-as-data_file.patch
-Patch38: libvirt-qemu-snapshot-delete-disk-image-only-if-parent-snapshot-is-external.patch
-Patch39: libvirt-storage_file-de-modularize-the-local-file-backend.patch
-Patch40: libvirt-qemu-re-use-existing-ActualNetDef-for-more-interface-types-during-update-device.patch
-Patch41: libvirt-tools-ssh-proxy-Check-for-domain-status-before-parsing-its-CID.patch
-Patch42: libvirt-build-Bump-minimum-glib2-version-to-2.66.0.patch
-Patch43: libvirt-qemuProcessHandleIOError-Refactor-to-extract-priv-instead-of-driver.patch
-Patch44: libvirt-qemu-Handle-quirks-of-device-field-of-BLOCK_IO_ERROR-event-in-monitor-code.patch
-Patch45: libvirt-qemu-Rename-diskAlias-to-device-in-qemu-IO-error-event-handling.patch
-Patch46: libvirt-qemuProcessHandleIOError-Rename-local-variables.patch
-Patch47: libvirt-qemuMonitorJSONHandleIOError-Do-not-munge-reason-field-of-IO-error-event.patch
-Patch48: libvirt-qemuProcessHandleIOError-Prefer-lookup-by-node-name.patch
-Patch49: libvirt-qemuMonitorJSONHandleIOError-Propagate-new-qom-path-field.patch
-Patch50: libvirt-virStorageSource-Add-fields-for-storing-last-I-O-error-message.patch
-Patch51: libvirt-qemuProcessHandleIOError-Populate-I-O-error-reason-to-virStorageSource.patch
-Patch52: libvirt-qemuProcessHandleIOError-Log-IO-errors-in-the-VM-log-file.patch
-Patch53: libvirt-libxlDomainGetMessages-Add-existing-flags-to-virCheckFlags.patch
-Patch54: libvirt-virDomainObjGetMessages-Refactor-using-GPtrArray.patch
-Patch55: libvirt-virDomainGetMessages-Introduce-VIR_DOMAIN_MESSAGE_IOERRORS.patch
-Patch56: libvirt-include-libvirt-domain-Reword-documentation-for-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch
-Patch57: libvirt-include-libvirt-domain-Add-message-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch
-Patch58: libvirt-qemuSnapshotForEachQcow2-Don-t-initialize-nrollback.patch
-Patch59: libvirt-qemu-process-Export-qemuPrepareNVRAM-for-use-in-snapshot-code.patch
-Patch60: libvirt-qemu-snapshot-Ensure-that-NVRAM-image-exists-when-taking-inactive-internal-snapshot.patch
-Patch61: libvirt-qemuxmlconftest-Allow-testing-of-the-writable-flag-for-passed-FDs-for-disks.patch
-Patch62: libvirt-qemuxmlconftest-Add-testing-of-FDs-with-writable-flag-in-disk-source-fd.patch
-Patch63: libvirt-qemu-domain-Initialize-FD-passthrough-for-a-virStorageSource-before-using-it.patch
-Patch64: libvirt-qemu_migration-Refactor-qemuMigrationSrcRestoreDomainState.patch
-Patch65: libvirt-qemu_migration-Do-not-automatically-resume-domain-after-I-O-error.patch
-Patch66: libvirt-qemucapabilitiestest-Add-data-for-the-qemu-10.0-dev-cycle-on-x86_64.patch
-Patch67: libvirt-qemucapabilitiestest-Update-caps_10.0.0_x86_64-to-v9.2.0-1636-gffaf7f0376.patch
-Patch68: libvirt-qemu-capabilies-Introduce-QEMU_CAPS_BLOCKDEV_SET_ACTIVE.patch
-Patch69: libvirt-qemu-monitor-Add-monitor-backend-for-blockdev-set-active.patch
-Patch70: libvirt-qemu-migration-Reactivate-block-nodes-after-migration-if-VM-is-left-paused.patch
-Patch71: libvirt-conf-change-virDomainHostdevInsert-to-return-void.patch
-Patch72: libvirt-qemu-fix-qemu-validation-to-forbid-guest-side-IP-address-for-type-vdpa.patch
-Patch73: libvirt-qemu-validate-that-model-is-virtio-for-vhostuser-and-vdpa-interfaces-in-the-same-place.patch
-Patch74: libvirt-qemu-automatically-set-model-type-virtio-for-interface-type-vhostuser.patch
-Patch75: libvirt-qemu-do-all-vhostuser-attribute-validation-in-qemu-driver.patch
-Patch76: libvirt-conf-qemu-make-source-element-almost-optional-for-type-vhostuser.patch
-Patch77: libvirt-qemu-use-switch-instead-of-if-in-qemuProcessPrepareDomainNetwork.patch
-Patch78: libvirt-qemu-make-qemuPasstCreateSocketPath-public.patch
-Patch79: libvirt-qemu-complete-vhostuser-passt-support.patch
-Patch80: libvirt-qemu-fail-validation-if-a-domain-def-has-vhostuser-passt-but-no-shared-mem.patch
-Patch81: libvirt-docs-improve-type-user-docs-to-higlight-differences-between-SLIRP-and-passt.patch
-Patch82: libvirt-docs-document-using-passt-backend-with-interface-type-vhostuser.patch
-Patch83: libvirt-utils-Canonicalize-paths-before-comparing-them.patch
-Patch84: libvirt-remote-add-sysusers-file-to-create-libvirt-group.patch
-Patch85: libvirt-qemu-Avoid-crash-in-qemuDomainCheckCPU-with-unknown-host-CPU.patch
-Patch86: libvirt-qemu_snapshot-allow-reverting-to-external-disk-only-snapshot.patch
-Patch87: libvirt-qemu-snapshot-error-out-early-when-reverting-snapshot-for-VM-with-non-file-disk.patch
-Patch88: libvirt-util-introduce-object-for-holding-a-system-inhibitor-lock.patch
-Patch89: libvirt-src-convert-drivers-over-to-new-virInhibitor-APIs.patch
-Patch90: libvirt-rpc-remove-logind-support-for-virNetDaemon.patch
-Patch91: libvirt-util-fix-off-by-1-in-inhibitor-constants.patch
-Patch92: libvirt-util-don-t-attempt-to-acquire-logind-inhibitor-if-not-requested.patch
-Patch93: libvirt-network-Free-inhibitor-in-networkStateCleanup.patch
-Patch94: libvirt-conf-introduce-support-for-multiple-ACPI-tables.patch
-Patch95: libvirt-src-validate-permitted-ACPI-table-types-in-libxl-qemu-drivers.patch
-Patch96: libvirt-src-introduce-raw-and-rawset-ACPI-table-types.patch
-Patch97: libvirt-qemu-support-raw-ACPI-table-type.patch
-Patch98: libvirt-libxl-support-rawset-ACPI-table-type.patch
-Patch99: libvirt-conf-support-MSDM-ACPI-table-type.patch
-Patch100: libvirt-qemu-support-MSDM-ACPI-table-type.patch
-Patch101: libvirt-qemuxmlconftest-Include-shared-memory-net-vhostuser-test-cases.patch
-Patch102: libvirt-qemuValidateDomainDeviceDefNetwork-Require-shared-memory-for-all-vhost-user-interfaces.patch
-Patch103: libvirt-qemu-process-Remove-un-updated-qemuProcessStartWarnShmem.patch
-Patch104: libvirt-esxConnectListAllDomains-Don-t-propagate-failure-to-lookup-a-single-domain.patch
-Patch105: libvirt-conf-parse-interface-source-dev-for-all-interface-types-with-backend-type-passt.patch
-Patch106: libvirt-libvirt-host-Clarify-fix-description-of-the-CPU-frequency-field.patch
-Patch107: libvirt-virNodeGetInfo-Improve-description-of-the-case-when-fake-data-is-reported.patch
-Patch108: libvirt-manpages-virsh-Use-disclaimer-from-virNodeGetInfo-for-virsh-nodeinfo.patch
-Patch109: libvirt-esx-Accept-empty-path-URI-component-same-way-as.patch
-Patch110: libvirt-qemu-Rename-outgoingMigration-parameter-in-various-TPM-functions.patch
-Patch111: libvirt-qemu-Properly-propagate-migration-state-to-TPM-cleanup-code.patch
-Patch112: libvirt-qemuDomainBlockCopyCommon-Don-t-revoke-access-to-file-twice-on-failure.patch
-Patch113: libvirt-qemuxmlconftest-Drop-s390-default-cpu-.ccw-virtio-2.7-test-cases.patch
-Patch114: libvirt-tests-add-capabilities-for-QEMU-10.0.0-on-s390x.patch
-Patch115: libvirt-qemu-Do-NOT-autoadd-NUMA-node-for-s390.patch
-Patch116: libvirt-qemu_command-Use-qemuBuildVirtioDevProps-to-build-cmd-line-for-virtio-mem-and-virtio-pmem.patch
-Patch117: libvirt-qemuxmlconftest-Introduce-memory-hotplug-virtio-mem-pci-s390x.xml.patch
-Patch118: libvirt-qemu_caps-Introduce-QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW.patch
-Patch119: libvirt-qemu-Validate-virtio-mem-ccw.patch
-Patch120: libvirt-qemu-Allow-virtio-mem-on-CCW.patch
-Patch121: libvirt-qemuxmlconftest-Introduce-memory-hotplug-virtio-mem-ccw-s390x.xml.patch
-Patch122: libvirt-qemu_domain_address-fix-CCW-virtio-mem-hotplug.patch
-Patch123: libvirt-Add-load-average-information-type-into-virDomainGetGuestInfo.patch
-Patch124: libvirt-qemu_agent-Add-qemuAgentGetLoadAvg.patch
-Patch125: libvirt-qemu-Add-support-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch
-Patch126: libvirt-virsh-Add-support-for-VIR_DOMAIN_GUEST_INFO_LOAD.patch
-Patch127: libvirt-qemu_capabilities-Fetch-caps-for-virtio-mem-ccw-too.patch
-Patch128: libvirt-cpu_map-Add-avx10-CPU-features.patch
-Patch129: libvirt-cpu_map-Add-GraniteRapids-v2-CPU-model.patch
-Patch130: libvirt-cpu_map-Add-sha512-sm3-and-sm4-CPU-features.patch
-Patch131: libvirt-virsh-Introduce-new-hypervisor-cpu-models-command.patch
-Patch132: libvirt-qemu-remove-nonsensical-sanity-check-in-processNetdevStreamDisconnectedEvent.patch
-Patch133: libvirt-qemu-make-processNetDevStreamDisconnectedEvent-reusable.patch
-Patch134: libvirt-qemu-respond-to-NETDEV_VHOST_USER_DISCONNECTED-event.patch
-Patch135: libvirt-qemu-put-vhost-user-code-that-s-special-for-passt-in-a-helper-function.patch
-Patch136: libvirt-qemu-make-passt-vhostuser-reconnect-behave-identically-to-passt-user.patch
-Patch137: libvirt-qemuMonitorJSONGetCPUModelExpansion-refactor-parsing-functions.patch
-Patch138: libvirt-qemu-parse-deprecated-props-from-query-cpu-model-expansion-response.patch
-Patch139: libvirt-qemu_capabilities-query-deprecated-features-for-host-model.patch
-Patch140: libvirt-libvirt-domain-introduce-VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEATURES.patch
-Patch141: libvirt-qemu_capabilities-filter-deprecated-features-if-requested.patch
-Patch142: libvirt-virsh-add-disable-deprecated-features-flag-to-domcapabilities.patch
-Patch143: libvirt-conf-add-deprecated_features-attribute.patch
-Patch144: libvirt-redhat-Restore-hunks-in-tests-qemucapabilitiesdata-caps_10.0.0_s390x.patch
-Patch145: libvirt-qemuPrepareNVRAMFile-Fix-NVRAM-image-conversion-check.patch
-Patch146: libvirt-qemu-introduce-QEMU_CAPS_AMD_IOMMU.patch
-Patch147: libvirt-qemu-introduce-QEMU_CAPS_PCI_ID.patch
-Patch148: libvirt-docs-formatdomain-document-intel-only-IOMMU-attributes.patch
-Patch149: libvirt-qemu-add-IOMMU-model-amd.patch
-Patch150: libvirt-conf-add-passthrough-and-xtsup-attributes-for-IOMMU.patch
-Patch151: libvirt-esx-Allow-specifying-different-CA-bundle-for-remote-connections.patch
-Patch152: libvirt-qemu-fix-order-of-VNC-TLS-config-entries.patch
-Patch153: libvirt-qemu-sanitize-blank-lines-in-config-file.patch
-Patch154: libvirt-qemu-add-ability-to-set-TLS-priority-string-with-QEMU.patch
+Patch1: libvirt-qemu-tpm-Account-for-possible-migration-without-actually-sharing-storage.patch
+Patch2: libvirt-tests-Test-virFileIsSharedFSOverride.patch
+Patch3: libvirt-util-Fix-race-condition-in-virFileIsSharedFSType.patch
+Patch4: libvirt-util-Fix-race-condition-in-virFileIsSharedFSOverride.patch
+Patch5: libvirt-util-Rework-virFileIsSharedFSOverride-using-virFileCheckParents.patch
+Patch6: libvirt-util-json-Increase-JSON-nesting-limit-when-parsing-to-300.patch
+Patch7: libvirt-virjsontest-Add-test-for-nesting-depth.patch
+Patch8: libvirt-qemu_validate-Drop-VIR_DOMAIN_HYPERV_SYNIC-dependency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch
+Patch9: libvirt-qemu_validate-Drop-VIR_DOMAIN_HYPERV_STIMER-dependency-on-VIR_DOMAIN_HYPERV_VPINDEX.patch
+Patch10: libvirt-esx_util-Introduce-esxUtil_EscapeInventoryObject.patch
+Patch11: libvirt-esx-URI-encode-inventory-objects-twice.patch
+Patch12: libvirt-qemuSecurityMoveImageMetadata-Move-seclabels-only-to-virStorageSource-of-same-type.patch
+Patch13: libvirt-qemuDomainSetThrottleGroup-Enforce-non-zero-groupname-string-length.patch
+Patch14: libvirt-qemuDomainSetBlockIoTuneField-Move-setting-of-group_name-out-of-the-loop.patch
+Patch15: libvirt-qemuDomainSetThrottleGroup-Always-honour-thottle-group-name-passed-as-argument.patch
+Patch16: libvirt-qemuDomainSetThrottleGroup-Don-t-put-group-name-into-the-tunable-event-twice.patch
+Patch17: libvirt-qemuSnapshotDiskHasBackingDisk-Avoid-call-of-virStorageSourceIsSameLocation-with-NULL-argument.patch
+Patch18: libvirt-qemuSnapshotUpdateBackingStore-Remove-stale-comment.patch
+Patch19: libvirt-qemuSnapshotDiskHasBackingDisk-Use-proper-max_depth-when-calling-virStorageSourceGetMetadata.patch
+Patch20: libvirt-virDomainSnapshotDefAssignExternalNames-Improve-error-message.patch
+Patch21: libvirt-qemuSnapshotUpdateBackingStore-Retry-as-curent-user-if-qemu-img-fails.patch
+Patch22: libvirt-qemublocktest-Iterate-all-nodenames-in-testQemuDetectBitmaps.patch
+Patch23: libvirt-qemu-monitor-Detect-list-of-bitmaps-from-qcow2-format-specific-data.patch
+Patch24: libvirt-qemuMigrationDstPrepareAnyBlockDirtyBitmaps-Fix-check-for-existing-bitmaps.patch
+Patch25: libvirt-qemu-migration-Always-offer-block-dirty-bitmaps-during-migration.patch
+Patch26: libvirt-qemuMigrationDstPrepareAnyBlockDirtyBitmaps-Always-consider-offered-bitmaps.patch
+Patch27: libvirt-qemu-Implement-support-for-associating-iommufd-to-hostdev.patch
+Patch28: libvirt-qemu-Introduce-privateData-for-hostdevs.patch
+Patch29: libvirt-qemu-Support-per-process-memory-accounting-for-iommufd.patch
+Patch30: libvirt-qemu-open-VFIO-FDs-from-libvirt-backend.patch
+Patch31: libvirt-qemu-open-iommufd-FD-from-libvirt-backend.patch
+Patch32: libvirt-qemu-Update-Cgroup-namespace-and-seclabel-for-iommufd.patch
+Patch33: libvirt-tests-qemuxmlconfdata-provide-iommufd-sample-XML-and-CLI-args.patch
+Patch34: libvirt-src-Use-device-alias-when-ifname-is-unset-in-virDomainInterfaceAddresses.patch
+Patch35: libvirt-qemu-Ignore-cmp_legacy-CPU-flag.patch
+Patch36: libvirt-qemu-capabilities-Probe-properties-of-scsi-block-and-scsi-generic-devices.patch
+Patch37: libvirt-qemu-capabilities-Introduce-QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR.patch
+Patch38: libvirt-RHEL-ONLY-backport-test-data-for-migrate-pr-capability-of-scsi-block.patch
+Patch39: libvirt-qemu-Implement-support-for-persistent-reservation-migration-control.patch
+Patch40: libvirt-qemu-Extract-disk-setup-done-via-QMP-into-a-separate-helper.patch
+Patch41: libvirt-qemu-process-Rename-qemuProcessSetupDiskThrottling-to-qemuProcessSetupDisks.patch
+Patch42: libvirt-qemu-monitor-Extract-block-latency-histogram-stats-into-qemuBlockStats.patch
+Patch43: libvirt-Expose-latency-histograms-via-virConnectGetAllDomainStats.patch
+Patch44: libvirt-qemu-monitor-Add-handlers-for-block-latency-histogram-set.patch
+Patch45: libvirt-docs-formatdomain-Fix-indentation-of-docs-for-disk-driver-statistics-element.patch
+Patch46: libvirt-docs-formatdomain-Reword-section-about-the-statistics-element-under-disk-driver.patch
+Patch47: libvirt-Introduce-support-for-disk-operation-latency-histogram-collection.patch
+Patch48: libvirt-qemu-Setup-disk-latency-histograms-on-startup-hotplug-update.patch
+Patch49: libvirt-qemu-Introduce-QEMU_CAPS_OBJECT_IOMMUFD.patch
+Patch50: libvirt-qemu-Move-IOMMUFD-validation-to-qemu_validate.patch
+Patch51: libvirt-util-Move-openning-IOMMU-device-to-viriommufd.patch
+Patch52: libvirt-qemu_process-Refactor-qemuProcessOpenIommuFd.patch
+Patch53: libvirt-util-Move-openning-VFIO-device-to-virpci.patch
+Patch54: libvirt-qemu_process-Refactor-qemuProcessOpenVfioDeviceFd.patch
+Patch55: libvirt-util-Use-virPCIDevice-as-argument-in-virPCIDeviceGetVfioPath.patch
+Patch56: libvirt-conf-Introduce-virHostdevIsPCIDeviceWithIOMMUFD.patch
+Patch57: libvirt-conf-Introduce-virDomainDefHasPCIHostdevWithIOMMUFD.patch
+Patch58: libvirt-qemu_domain-Add-missing-IOMMUFD-cleanup.patch
+Patch59: libvirt-qemu_process-Fix-FD-leak-with-multiple-host-devices-using-IOMMUFD.patch
+Patch60: libvirt-qemu_process-Refactor-qemuProcessOpenVfioFds.patch
+Patch61: libvirt-qemuxmlconftest-Refactor-host-device-preparation.patch
+Patch62: libvirt-qemuxmlconftest-Rename-and-refactor-testSetupHostdevPrivateData.patch
+Patch63: libvirt-qemuxmlconftest-Set-fake-FD-for-IOMMUFD.patch
+Patch64: libvirt-qemu-Convert-IOMMUFD-to-qemuFDPassDirect.patch
+Patch65: libvirt-qemu-Convert-vfioDeviceFd-to-qemuFDPassDirect.patch
+Patch66: libvirt-qemu_command-Don-t-use-host-property-if-IOMMUFD-is-used.patch
+Patch67: libvirt-qemu-Save-IOMMUFD-state-into-status-XML.patch
+Patch68: libvirt-qemu_hotplug-Remove-iommufd-object-if-no-longer-needed.patch
+Patch69: libvirt-qemu_command-Extract-building-IOMMUFD-props-to-function.patch
+Patch70: libvirt-qemu_hotplug-Add-support-to-hotplug-host-device-with-IOMMUFD.patch
+Patch71: libvirt-conf-Introduce-iommufd-enum-for-domaincaps.patch
+Patch72: libvirt-qemu-Fill-iommufd-domain-capability.patch
+Patch73: libvirt-tests-properly-mock-VFIO-and-IOMMU-checks.patch
+Patch74: libvirt-iommufd-fix-FD-leak-in-case-of-error.patch
+Patch75: libvirt-domain_conf-initialize-network-hostdev-private-data.patch
+Patch76: libvirt-qemu_hotplug-enter-monitor-in-order-to-rollback-passed-FD.patch
+Patch77: libvirt-qemu_hotplug-Fix-crash-when-attaching-network-inteface-with-hostdev-network.patch
 
 
 Requires: libvirt-daemon = %{version}-%{release}
@@ -472,6 +400,9 @@ Obsoletes: libvirt-daemon-uml <= 5.0.0
 %if %{with_vbox}
 Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
 %endif
+%if %{with_ch}
+Requires: libvirt-daemon-driver-ch = %{version}-%{release}
+%endif
 Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
 Requires: libvirt-daemon-driver-interface = %{version}-%{release}
 Requires: libvirt-daemon-driver-secret = %{version}-%{release}
@@ -486,7 +417,7 @@ Requires: libvirt-libs = %{version}-%{release}
 BuildRequires: python3-docutils
 BuildRequires: meson >= 0.56.0
 BuildRequires: ninja-build
-BuildRequires: git
+BuildRequires: git-core
 BuildRequires: perl-interpreter
 BuildRequires: python3
 BuildRequires: python3-pytest
@@ -523,12 +454,7 @@ BuildRequires: sanlock-devel >= 2.4
 BuildRequires: libpcap-devel >= 1.5.0
 BuildRequires: libnl3-devel
 BuildRequires: libselinux-devel
-# For modprobe
-BuildRequires: kmod
 BuildRequires: cyrus-sasl-devel
-BuildRequires: polkit >= 0.112
-# For mount/umount in FS driver
-BuildRequires: util-linux
     %if %{with_qemu}
 # For managing ACLs
 BuildRequires: libacl-devel
@@ -539,10 +465,6 @@ BuildRequires: /usr/bin/qemu-img
     %if %{with_nbdkit}
 BuildRequires: libnbd-devel
     %endif
-# For LVM drivers
-BuildRequires: lvm2
-# For pool type=iscsi
-BuildRequires: iscsi-initiator-utils
     %if %{with_storage_iscsi_direct}
 # For pool type=iscsi-direct
 BuildRequires: libiscsi-devel
@@ -565,7 +487,7 @@ BuildRequires: numactl-devel
     %endif
 BuildRequires: libcap-ng-devel >= 0.5.0
     %if %{with_fuse}
-BuildRequires: fuse-devel >= 2.8.6
+BuildRequires: fuse3-devel
     %endif
     %if %{with_libssh2}
 BuildRequires: libssh2-devel >= 1.3.0
@@ -582,11 +504,6 @@ BuildRequires: libwsman-devel >= 2.6.3
 BuildRequires: audit-libs-devel
 BuildRequires: systemtap-sdt-devel
 BuildRequires: /usr/bin/dtrace
-# For mount/umount in FS driver
-BuildRequires: util-linux
-    %if %{with_numad}
-BuildRequires: numad
-    %endif
     %if %{with_wireshark}
 BuildRequires: wireshark-devel
     %endif
@@ -667,6 +584,8 @@ Requires: libvirt-libs = %{version}-%{release}
 # Recommends here will install libvirt-client by default (if available), but
 # RPM won't complain if the package is unavailable, masked, or removed later.
 Recommends: libvirt-client = %{version}-%{release}
+# For modprobe and rmmod
+Requires: kmod
 # for /sbin/ip
 Requires: iproute
 # for /sbin/tc
@@ -681,8 +600,10 @@ Requires(posttrans): /usr/bin/systemctl
 Requires(preun): /usr/bin/systemctl
 # libvirtd depends on 'messagebus' service
 Requires: dbus
+    %if %{with_account_add}
 # For uid creation during pre
 Requires(pre): shadow-utils
+    %endif
 # Needed by /usr/libexec/libvirt-guests.sh script.
     %if 0%{?fedora}
 Requires: gettext-runtime
@@ -709,6 +630,7 @@ resources
 %package daemon-plugin-lockd
 Summary: lockd client plugin for virtlockd
 Requires: libvirt-libs = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
 Requires: libvirt-daemon-lock = %{version}-%{release}
 
 %description daemon-plugin-lockd
@@ -823,7 +745,7 @@ Summary: Storage driver plugin including base backends for the libvirtd daemon
 Requires: libvirt-daemon-common = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Recommends: nfs-utils
-# For mkfs
+# For mkfs and mount/umount
 Requires: util-linux
 # For storage wiping with different algorithms
 Requires: scrub
@@ -935,9 +857,13 @@ volumes using the ceph protocol.
 Summary: Storage driver plugin for ZFS
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
-# Support any conforming implementation of zfs
+# Starting with Fedora 43 the 'zfs-fuse' is no longer shipped but obtainable
+# externally. The package builds fine without these. Users will have to provide
+# their own implementation.
+        %if 0%{?fedora} && 0%{?fedora} < 43
 Requires: /sbin/zfs
 Requires: /sbin/zpool
+        %endif
 
 %description daemon-driver-storage-zfs
 The storage driver backend adding implementation of the storage APIs for
@@ -961,7 +887,10 @@ Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release}
     %if %{with_storage_rbd}
 Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release}
     %endif
-    %if %{with_storage_zfs}
+# Starting with Fedora 43 the 'zfs-fuse' is no longer shipped but obtainable
+# externally. We do not want to install this as part of 'daemon-driver-storage'
+# any more.
+    %if %{with_storage_zfs} && 0%{?fedora} && 0%{?fedora} < 43
 Requires: libvirt-daemon-driver-storage-zfs = %{version}-%{release}
     %endif
 
@@ -988,7 +917,7 @@ Requires: swtpm-tools
         %if %{with_numad}
 Requires: numad
         %endif
-        %if 0%{?fedora} || 0%{?rhel} >= 9
+        %if 0%{?fedora} || 0%{?rhel}
 Recommends: passt
 Recommends: passt-selinux
         %endif
@@ -1181,6 +1110,20 @@ Server side daemon and driver required to manage the virtualization
 capabilities of VirtualBox
     %endif
 
+    %if %{with_ch}
+%package daemon-driver-ch
+Summary: Cloud-Hypervisor driver plugin for libvirtd daemon
+Requires: libvirt-daemon-common = %{version}-%{release}
+Requires: libvirt-daemon-log = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
+
+%description daemon-driver-ch
+The ch driver plugin for the libvirtd daemon, providing
+an implementation of the hypervisor driver APIs by
+Cloud-Hypervisor
+    %endif
+
+
 %package client
 Summary: Client side utilities of the libvirt library
 Requires: libvirt-libs = %{version}-%{release}
@@ -1226,6 +1169,10 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic.
 %package login-shell
 Summary: Login shell for connecting users to an LXC container
 Requires: libvirt-libs = %{version}-%{release}
+        %if %{with_account_add}
+# For uid creation during pre
+Requires(pre): shadow-utils
+        %endif
 
 %description login-shell
 Provides the set-uid virt-login-shell binary that is used to
@@ -1248,6 +1195,7 @@ Requires: sanlock >= 2.4
 #for virt-sanlock-cleanup require augeas
 Requires: augeas
 Requires: libvirt-libs = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
 Obsoletes: libvirt-lock-sanlock < 9.1.0
 Provides: libvirt-lock-sanlock = %{version}-%{release}
 
@@ -1346,9 +1294,15 @@ exit 1
 %endif
 
 %if %{with_esx}
-    %define arg_esx -Ddriver_esx=enabled -Dcurl=enabled
+    %define arg_esx -Ddriver_esx=enabled
 %else
-    %define arg_esx -Ddriver_esx=disabled -Dcurl=disabled
+    %define arg_esx -Ddriver_esx=disabled
+%endif
+
+%if %{with_esx} || %{with_ch}
+    %define arg_curl -Dcurl=enabled
+%else
+    %define arg_curl -Dcurl=disabled
 %endif
 
 %if %{with_hyperv}
@@ -1363,6 +1317,12 @@ exit 1
     %define arg_vmware -Ddriver_vmware=disabled
 %endif
 
+%if %{with_ch}
+    %define arg_ch -Ddriver_ch=enabled
+%else
+    %define arg_ch -Ddriver_ch=disabled
+%endif
+
 %if %{with_storage_rbd}
     %define arg_storage_rbd -Dstorage_rbd=enabled
 %else
@@ -1459,12 +1419,6 @@ exit 1
     %define arg_remote_mode -Dremote_default_mode=legacy
 %endif
 
-%if %{with_userfaultfd_sysctl}
-    %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=enabled
-%else
-    %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=disabled
-%endif
-
 %define when  %(date +"%%F-%%T")
 %define where %(hostname)
 %define who   %{?packager}%{!?packager:Unknown}
@@ -1493,11 +1447,12 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
            -Ddriver_remote=enabled \
            -Ddriver_test=enabled \
            %{?arg_esx} \
+           %{?arg_curl} \
            %{?arg_hyperv} \
            %{?arg_vmware} \
+           %{?arg_ch} \
            -Ddriver_vz=disabled \
            -Ddriver_bhyve=disabled \
-           -Ddriver_ch=disabled \
            %{?arg_remote_mode} \
            -Ddriver_interface=enabled \
            -Ddriver_network=enabled \
@@ -1547,7 +1502,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
            -Dqemu_datadir=%{qemu_datadir} \
            -Dtls_priority=%{tls_priority} \
            -Dsysctl_config=enabled \
-           %{?arg_userfaultfd_sysctl} \
            -Dssh_proxy=enabled \
            %{?enable_werror} \
            -Dexpensive_tests=enabled \
@@ -1577,6 +1531,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
   -Dblkid=disabled \
   -Dcapng=disabled \
   -Ddriver_bhyve=disabled \
+  -Ddriver_ch=disabled \
   -Ddriver_hyperv=disabled \
   -Ddriver_interface=disabled \
   -Ddriver_libvirtd=disabled \
@@ -1634,7 +1589,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
   -Dstorage_vstorage=disabled \
   -Dstorage_zfs=disabled \
   -Dsysctl_config=disabled \
-  -Duserfaultfd_sysctl=disabled \
   -Dssh_proxy=disabled \
   -Dtests=disabled \
   -Dudev=disabled \
@@ -1699,6 +1653,10 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.libxl
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
     %endif
+    %if ! %{with_ch}
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_ch.aug
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_ch.aug
+    %endif
 
 # Copied into libvirt-docs subpackage eventually
 mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs
@@ -1909,10 +1867,12 @@ export VIR_TEST_DEBUG=1
 %pre daemon-common
 %libvirt_sysconfig_pre libvirt-guests
 %libvirt_systemd_oneshot_pre libvirt-guests
+    %if %{with_account_add}
 # 'libvirt' group is just to allow password-less polkit access to libvirt
 # daemons. The uid number is irrelevant, so we use dynamic allocation.
 getent group libvirt >/dev/null || groupadd -r libvirt
 exit 0
+    %endif
 
 %posttrans daemon-common
 %libvirt_sysconfig_posttrans libvirt-guests
@@ -2035,6 +1995,7 @@ exit 0
 %libvirt_sysconfig_pre virtqemud
 %libvirt_systemd_unix_pre virtqemud
 
+        %if %{with_account_add}
 # We want soft static allocation of well-known ids, as disk images
 # are commonly shared across NFS mounts by id rather than name.
 # See https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/
@@ -2050,6 +2011,7 @@ if ! getent passwd 'qemu' >/dev/null; then
   fi
 fi
 exit 0
+        %endif
 
 %posttrans daemon-driver-qemu
 %libvirt_sysconfig_posttrans virtqemud
@@ -2098,6 +2060,19 @@ exit 0
 %libvirt_systemd_unix_preun virtxend
     %endif
 
+    %if %{with_ch}
+%pre daemon-driver-ch
+%libvirt_sysconfig_pre virtchd
+%libvirt_systemd_unix_pre virtchd
+
+%posttrans daemon-driver-ch
+%libvirt_sysconfig_posttrans virtchd
+%libvirt_systemd_unix_posttrans virtchd
+
+%preun daemon-driver-ch
+%libvirt_systemd_unix_preun virtchd
+    %endif
+
 %pre daemon-config-network
 %libvirt_systemd_config_pre libvirtd
 %libvirt_systemd_config_pre virtnetworkd
@@ -2163,8 +2138,10 @@ done
 
     %if %{with_lxc}
 %pre login-shell
+        %if %{with_account_add}
 getent group virtlogin >/dev/null || groupadd -r virtlogin
 exit 0
+        %endif
     %endif
 %endif
 
@@ -2185,7 +2162,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
 %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
+%dir %{_datadir}/augeas/lenses
 %{_datadir}/augeas/lenses/libvirtd.aug
+%dir %{_datadir}/augeas/lenses/tests
 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %{_mandir}/man8/libvirtd.8*
@@ -2205,6 +2184,8 @@ exit 0
 %dir %attr(0755, root, root) %{_libdir}/libvirt/
 %dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/
 %dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/
+%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/
+%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
 %{_datadir}/polkit-1/actions/org.libvirt.api.policy
 %{_datadir}/polkit-1/rules.d/50-libvirt.rules
@@ -2236,7 +2217,6 @@ exit 0
 %{_mandir}/man8/virtlockd.8*
 
 %files daemon-plugin-lockd
-%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
 %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
 
 %files daemon-log
@@ -2400,7 +2380,6 @@ exit 0
     %if %{with_storage_gluster}
 %files daemon-driver-storage-gluster
 %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so
-%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/
 %{_libdir}/libvirt/storage-file/libvirt_storage_file_gluster.so
     %endif
 
@@ -2417,9 +2396,6 @@ exit 0
     %if %{with_qemu}
 %files daemon-driver-qemu
 %config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf
-        %if %{with_userfaultfd_sysctl}
-%config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf
-        %endif
 %{_datadir}/augeas/lenses/virtqemud.aug
 %{_datadir}/augeas/lenses/tests/test_virtqemud.aug
 %{_unitdir}/virtqemud.service
@@ -2551,7 +2527,6 @@ exit 0
         %if %{with_libxl}
 %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf
         %endif
-%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
 %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
 %{_datadir}/augeas/lenses/libvirt_sanlock.aug
 %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
@@ -2561,6 +2536,22 @@ exit 0
 %attr(0755, root, root) %{_libexecdir}/libvirt_sanlock_helper
     %endif
 
+    %if %{with_ch}
+%files daemon-driver-ch
+%attr(0755, root, root) %{_sbindir}/virtchd
+%config(noreplace) %{_sysconfdir}/libvirt/virtchd.conf
+%{_datadir}/augeas/lenses/virtchd.aug
+%{_datadir}/augeas/lenses/tests/test_virtchd.aug
+%{_unitdir}/virtchd-admin.socket
+%{_unitdir}/virtchd-ro.socket
+%{_unitdir}/virtchd.service
+%{_unitdir}/virtchd.socket
+%{_libdir}/libvirt/connection-driver/libvirt_driver_ch.so
+%config(noreplace) %{_sysconfdir}/libvirt/ch.conf
+%{_datadir}/augeas/lenses/libvirtd_ch.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_ch.aug
+    %endif
+
 %files client
 %{_mandir}/man1/virsh.1*
 %{_mandir}/man1/virt-xml-validate.1*
@@ -2591,15 +2582,17 @@ exit 0
 %{_libdir}/libvirt-lxc.so.*
 %{_libdir}/libvirt-admin.so.*
 %dir %{_datadir}/libvirt/
+%{_datadir}/libvirt/test-screenshot.png
 %dir %{_datadir}/libvirt/schemas/
+%{_datadir}/libvirt/schemas/*.rng
+%dir %{_datadir}/systemtap/tapset/
 %{_datadir}/systemtap/tapset/libvirt_probes*.stp
 %{_datadir}/systemtap/tapset/libvirt_functions.stp
     %if %{with_qemu}
 %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
     %endif
-%{_datadir}/libvirt/schemas/*.rng
+%dir %{_datadir}/libvirt/cpu_map
 %{_datadir}/libvirt/cpu_map/*.xml
-%{_datadir}/libvirt/test-screenshot.png
 
     %if %{with_wireshark}
 %files wireshark
@@ -2619,6 +2612,7 @@ exit 0
 %attr(4750, root, virtlogin) %{_bindir}/virt-login-shell
 %{_libexecdir}/virt-login-shell-helper
 %config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
+%{_sysusersdir}/libvirt-login-shell.conf
 %{_mandir}/man1/virt-login-shell.1*
     %endif
 
@@ -2776,6 +2770,121 @@ exit 0
 %endif
 
 %changelog
+* Tue Mar 10 2026 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-12
+- qemu_hotplug: Fix crash when attaching network inteface with hostdev network (RHEL-151953)
+
+* Fri Mar  6 2026 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-11
+- domain_conf: initialize network hostdev private data (RHEL-151953)
+- qemu_hotplug: enter monitor in order to rollback passed FD (RHEL-151953)
+
+* Wed Feb 18 2026 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-10
+- qemu: Introduce QEMU_CAPS_OBJECT_IOMMUFD (RHEL-150353)
+- qemu: Move IOMMUFD validation to qemu_validate (RHEL-150353)
+- util: Move openning IOMMU device to viriommufd (RHEL-150353)
+- qemu_process: Refactor qemuProcessOpenIommuFd (RHEL-150353)
+- util: Move openning VFIO device to virpci (RHEL-150353)
+- qemu_process: Refactor qemuProcessOpenVfioDeviceFd (RHEL-150353)
+- util: Use virPCIDevice as argument in virPCIDeviceGetVfioPath (RHEL-150353)
+- conf: Introduce virHostdevIsPCIDeviceWithIOMMUFD (RHEL-150353)
+- conf: Introduce virDomainDefHasPCIHostdevWithIOMMUFD (RHEL-150353)
+- qemu_domain: Add missing IOMMUFD cleanup (RHEL-150353)
+- qemu_process: Fix FD leak with multiple host devices using IOMMUFD (RHEL-150353)
+- qemu_process: Refactor qemuProcessOpenVfioFds (RHEL-150353)
+- qemuxmlconftest: Refactor host device preparation (RHEL-150353)
+- qemuxmlconftest: Rename and refactor testSetupHostdevPrivateData (RHEL-150353)
+- qemuxmlconftest: Set fake FD for IOMMUFD (RHEL-150353)
+- qemu: Convert IOMMUFD to qemuFDPassDirect (RHEL-150353)
+- qemu: Convert vfioDeviceFd to qemuFDPassDirect (RHEL-150353)
+- qemu_command: Don't use host property if IOMMUFD is used (RHEL-150353)
+- qemu: Save IOMMUFD state into status XML (RHEL-150353)
+- qemu_hotplug: Remove iommufd object if no longer needed (RHEL-150353)
+- qemu_command: Extract building IOMMUFD props to function (RHEL-150353)
+- qemu_hotplug: Add support to hotplug host device with IOMMUFD (RHEL-150353)
+- conf: Introduce iommufd enum for domaincaps (RHEL-138544)
+- qemu: Fill iommufd domain capability (RHEL-138544)
+- tests: properly mock VFIO and IOMMU checks (RHEL-138544)
+- iommufd: fix FD leak in case of error (RHEL-150353)
+
+* Tue Feb 17 2026 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-9
+- qemu: capabilities: Probe properties of 'scsi-block' and 'scsi-generic' devices (RHEL-140614)
+- qemu: capabilities: Introduce QEMU_CAPS_DEVICE_SCSI_BLOCK_MIGRATE_PR (RHEL-140614)
+- RHEL-ONLY: backport test data for 'migrate-pr' capability of 'scsi-block' (RHEL-140614)
+- qemu: Implement support for persistent reservation migration control (RHEL-140614)
+- qemu: Extract disk setup done via QMP into a separate helper (RHEL-147866)
+- qemu: process: Rename 'qemuProcessSetupDiskThrottling' to 'qemuProcessSetupDisks' (RHEL-147866)
+- qemu: monitor: Extract block latency histogram stats into 'qemuBlockStats' (RHEL-147866)
+- Expose latency histograms via 'virConnectGetAllDomainStats' (RHEL-147866)
+- qemu: monitor: Add handlers for 'block-latency-histogram-set' (RHEL-147866)
+- docs: formatdomain: Fix indentation of docs for <disk><driver><statistics> element (RHEL-147866)
+- docs: formatdomain: Reword section about the '<statistics>' element under disk driver (RHEL-147866)
+- Introduce support for disk operation latency histogram collection (RHEL-147866)
+- qemu: Setup disk latency histograms on startup/hotplug/update (RHEL-147866)
+
+* Wed Feb 11 2026 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-8
+- qemu: Ignore cmp_legacy CPU flag (RHEL-146629)
+
+* Tue Feb 10 2026 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-7
+- src: Use device alias when ifname is unset in virDomainInterfaceAddresses() (RHEL-141496)
+
+* Fri Feb  6 2026 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-6
+- qemu: Implement support for associating iommufd to hostdev (RHEL-126345)
+- qemu: Introduce privateData for hostdevs (RHEL-126345)
+- qemu: Support per-process memory accounting for iommufd (RHEL-126345)
+- qemu: open VFIO FDs from libvirt backend (RHEL-126345)
+- qemu: open iommufd FD from libvirt backend (RHEL-126345)
+- qemu: Update Cgroup, namespace, and seclabel for iommufd (RHEL-126345)
+- tests: qemuxmlconfdata: provide iommufd sample XML and CLI args (RHEL-126345)
+
+* Wed Feb  4 2026 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-5
+- qemublocktest: Iterate all nodenames in 'testQemuDetectBitmaps' (RHEL-145770)
+- qemu: monitor: Detect list of bitmaps from 'qcow2' format specific data (RHEL-145770)
+- qemuMigrationDstPrepareAnyBlockDirtyBitmaps: Fix check for existing bitmaps (RHEL-145770)
+- qemu: migration: Always offer block dirty bitmaps during migration (RHEL-145770)
+- qemuMigrationDstPrepareAnyBlockDirtyBitmaps: Always consider offered bitmaps (RHEL-145770)
+
+* Thu Jan 29 2026 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-4
+- qemuSecurityMoveImageMetadata: Move seclabels only to virStorageSource of same type (RHEL-140624)
+- qemuDomainSetThrottleGroup: Enforce non-zero 'groupname' string length (RHEL-144010)
+- qemuDomainSetBlockIoTuneField: Move setting of 'group_name' out of the loop (RHEL-144010)
+- qemuDomainSetThrottleGroup: Always honour thottle group name passed as argument (RHEL-144010)
+- qemuDomainSetThrottleGroup: Don't put group name into the 'tunable' event twice (RHEL-144010)
+- qemuSnapshotDiskHasBackingDisk: Avoid call of virStorageSourceIsSameLocation with NULL argument (RHEL-144090)
+- qemuSnapshotUpdateBackingStore: Remove stale comment (RHEL-144090)
+- qemuSnapshotDiskHasBackingDisk: Use proper 'max_depth' when calling 'virStorageSourceGetMetadata' (RHEL-144090)
+- virDomainSnapshotDefAssignExternalNames: Improve error message (RHEL-144090)
+- qemuSnapshotUpdateBackingStore: Retry as curent user if qemu-img fails (RHEL-144090)
+
+* Tue Jan 13 2026 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-3
+- util: json: Increase JSON nesting limit when parsing to 300 (RHEL-135128)
+- virjsontest: Add test for nesting depth (RHEL-135128)
+- qemu_validate: Drop VIR_DOMAIN_HYPERV_SYNIC dependency on VIR_DOMAIN_HYPERV_VPINDEX (RHEL-138689)
+- qemu_validate: Drop VIR_DOMAIN_HYPERV_STIMER dependency on VIR_DOMAIN_HYPERV_VPINDEX (RHEL-138689)
+- esx_util: Introduce esxUtil_EscapeInventoryObject() (RHEL-134127)
+- esx: URI encode inventory objects twice (RHEL-134127)
+
+* Thu Dec 18 2025 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-2
+- qemu: tpm: Account for possible migration without actually sharing storage (RHEL-108915)
+- tests: Test virFileIsSharedFSOverride (RHEL-135287)
+- util: Fix race condition in virFileIsSharedFSType (RHEL-135287)
+- util: Fix race condition in virFileIsSharedFSOverride (RHEL-135287)
+- util: Rework virFileIsSharedFSOverride using virFileCheckParents (RHEL-135287)
+
+* Tue Dec  2 2025 Jiri Denemark <jdenemar@redhat.com> - 11.10.0-1
+- Rebased to libvirt-11.10.0 (RHEL-118197)
+- The rebase also fixes the following bugs:
+    RHEL-126090, RHEL-128107
+- spec: Fix RPM build when %{fedora} is undefined (RHEL-118197)
+
+* Tue Nov  4 2025 Jiri Denemark <jdenemar@redhat.com> - 11.9.0-1
+- Rebased to libvirt-11.9.0 (RHEL-118197)
+- The rebase also fixes the following bugs:
+    RHEL-114003
+
+* Wed Oct  1 2025 Jiri Denemark <jdenemar@redhat.com> - 11.8.0-1
+- Rebased to libvirt-11.8.0 (RHEL-118197)
+- The rebase also fixes the following bugs:
+    RHEL-15693, RHEL-95397, RHEL-111609, RHEL-116847, RHEL-117774
+
 * Mon Aug 18 2025 Jiri Denemark <jdenemar@redhat.com> - 10.10.0-15
 - qemu: fix order of VNC TLS config entries (RHEL-106276)
 - qemu: sanitize blank lines in config file (RHEL-106276)